vovk 3.2.1 → 3.4.0

package/dist/createVovkApp.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVovkApp = createVovkApp;
+const VovkApp_1 = require("./VovkApp");
+const types_1 = require("./types");
+const getSchema_1 = __importDefault(require("./utils/getSchema"));
+const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
+const isClass = (func) => typeof func === 'function' && /class/.test(func.toString());
+const toKebabCase = (str) => str
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2') // Add hyphen between lowercase/digit and uppercase
+    .replace(/([A-Z])([A-Z])(?=[a-z])/g, '$1-$2') // Add hyphen between uppercase letters if the second one is followed by a lowercase
+    .toLowerCase()
+    .replace(/^-/, ''); // Remove leading hyphen
+const assignSchema = ({ controller, propertyKey, path, options, httpMethod, vovkApp, }) => {
+    if (typeof window !== 'undefined') {
+        throw new Error('Decorators are intended for server-side use only. You have probably imported a controller on the client-side.');
+    }
+    if (!isClass(controller)) {
+        let decoratorName = httpMethod.toLowerCase();
+        if (decoratorName === 'delete')
+            decoratorName = 'del';
+        throw new Error(`Decorator must be used on a static class method. Check the controller method named "${propertyKey}" used with @${decoratorName}().`);
+    }
+    const methods = vovkApp.routes[httpMethod].get(controller) ?? {};
+    vovkApp.routes[httpMethod].set(controller, methods);
+    const originalMethod = controller[propertyKey];
+    originalMethod._controller = controller;
+    originalMethod._sourceMethod = originalMethod._sourceMethod ?? originalMethod;
+    const schema = originalMethod._sourceMethod._getSchema?.(controller);
+    controller._handlers = {
+        ...controller._handlers,
+        [propertyKey]: {
+            ...schema,
+            ...(controller._handlers ?? {})[propertyKey],
+            path,
+            httpMethod,
+        },
+    };
+    methods[path] = controller[propertyKey];
+    methods[path]._options = options;
+    controller._handlersMetadata = {
+        ...controller._handlersMetadata,
+        [propertyKey]: {
+            ...(controller._handlersMetadata ?? {})[propertyKey],
+            staticParams: options?.staticParams,
+        },
+    };
+};
+function createVovkApp() {
+    const vovkApp = new VovkApp_1.VovkApp();
+    const createHTTPDecorator = (httpMethod) => {
+        function decoratorCreator(givenPath = '', options) {
+            const path = trimPath(givenPath);
+            function decorator(givenTarget, propertyKey) {
+                const controller = givenTarget;
+                assignSchema({ controller, propertyKey, path, options, httpMethod, vovkApp });
+            }
+            return decorator;
+        }
+        const auto = (options) => {
+            function decorator(givenTarget, propertyKey) {
+                const controller = givenTarget;
+                const methods = vovkApp.routes[httpMethod].get(controller) ?? {};
+                vovkApp.routes[httpMethod].set(controller, methods);
+                controller._handlers = {
+                    ...controller._handlers,
+                    [propertyKey]: {
+                        ...(controller._handlers ?? {})[propertyKey],
+                        httpMethod,
+                    },
+                };
+                const properties = Object.keys(controller._handlers[propertyKey]?.validation?.params?.properties ?? {});
+                const kebab = toKebabCase(propertyKey); // 🥙
+                const path = properties.length ? `${kebab}/${properties.map((prop) => `:${prop}`).join('/')}` : kebab;
+                assignSchema({ controller, propertyKey, path, options, httpMethod, vovkApp });
+            }
+            return decorator;
+        };
+        const enhancedDecoratorCreator = decoratorCreator;
+        enhancedDecoratorCreator.auto = auto;
+        return enhancedDecoratorCreator;
+    };
+    const prefix = (givenPath = '') => {
+        const path = trimPath(givenPath);
+        return (givenTarget) => {
+            const controller = givenTarget;
+            controller._prefix = path;
+            return givenTarget;
+        };
+    };
+    const initVovk = (options) => {
+        for (const [rpcModuleName, controller] of Object.entries(options.controllers)) {
+            controller._rpcModuleName = rpcModuleName;
+            controller._activated = true;
+            controller._onError = options?.onError;
+        }
+        async function GET_DEV(req, data) {
+            const params = await data.params;
+            if (params[Object.keys(params)[0]]?.[0] === '_schema_') {
+                const schema = (0, getSchema_1.default)(options);
+                return vovkApp.respond(200, { schema });
+            }
+            return vovkApp.GET(req, data);
+        }
+        return {
+            GET: process.env.NODE_ENV === 'development' ? GET_DEV : vovkApp.GET,
+            POST: vovkApp.POST,
+            PUT: vovkApp.PUT,
+            PATCH: vovkApp.PATCH,
+            DELETE: vovkApp.DELETE,
+            HEAD: vovkApp.HEAD,
+            OPTIONS: vovkApp.OPTIONS,
+        };
+    };
+    return {
+        get: createHTTPDecorator(types_1.HttpMethod.GET),
+        post: createHTTPDecorator(types_1.HttpMethod.POST),
+        put: createHTTPDecorator(types_1.HttpMethod.PUT),
+        patch: createHTTPDecorator(types_1.HttpMethod.PATCH),
+        del: createHTTPDecorator(types_1.HttpMethod.DELETE),
+        head: createHTTPDecorator(types_1.HttpMethod.HEAD),
+        options: createHTTPDecorator(types_1.HttpMethod.OPTIONS),
+        prefix,
+        initVovk,
+    };
+}

package/dist/internal.d.ts

@@ -2,12 +2,12 @@ export { deepExtend } from './utils/deepExtend.js';
 export { resolveGeneratorConfigValues } from './core/resolveGeneratorConfigValues.js';
 export { createCodeSamples } from './samples/createCodeSamples.js';
 export { withValidationLibrary } from './validation/withValidationLibrary.js';
+export { validationSchemasObjectToSingleValidationSchema } from './validation/validationSchemasObjectToSingleValidationSchema.js';
 export { operation } from './openapi/operation.js';
 export { openAPIToVovkSchema } from './openapi/openAPIToVovkSchema/index.js';
 export { vovkSchemaToOpenAPI } from './openapi/vovkSchemaToOpenAPI.js';
 export { readableStreamToAsyncIterable } from './client/defaultStreamHandler.js';
 export { VovkSchemaIdEnum } from './types/enums.js';
-export type { VovkToolDerived, VovkToolNonDerived } from './types/tools.js';
 export type { MCPModelOutput } from './tools/toModelOutputMCP.js';
 export type { VovkErrorResponse, VovkMetaSchema, VovkSegmentSchema, VovkControllerSchema, VovkHandlerSchema, VovkValidationType, } from './types/core.js';
 export type { VovkTypedProcedure } from './types/validation.js';

package/dist/internal.js

@@ -3,6 +3,7 @@ export { deepExtend } from './utils/deepExtend.js';
 export { resolveGeneratorConfigValues } from './core/resolveGeneratorConfigValues.js';
 export { createCodeSamples } from './samples/createCodeSamples.js';
 export { withValidationLibrary } from './validation/withValidationLibrary.js';
+export { validationSchemasObjectToSingleValidationSchema } from './validation/validationSchemasObjectToSingleValidationSchema.js';
 export { operation } from './openapi/operation.js';
 export { openAPIToVovkSchema } from './openapi/openAPIToVovkSchema/index.js';
 export { vovkSchemaToOpenAPI } from './openapi/vovkSchemaToOpenAPI.js';

package/dist/tools/createTool.d.ts

@@ -7,120 +7,120 @@ export declare const createTool: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema: import("../types/validation.js").CombinedSpec<TInput, TInput>;
     } & {
         outputSchema: import("../types/validation.js").CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
+    }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
     <TInput, TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema: import("../types/validation.js").CombinedSpec<TInput, TInput>;
     } & {
         outputSchema: import("../types/validation.js").CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
+    }): import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
     <TInput, TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema: import("../types/validation.js").CombinedSpec<TInput, TInput>;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): import("../internal.js").VovkToolNonDerived<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
+    }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
     <TInput, TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema: import("../types/validation.js").CombinedSpec<TInput, TInput>;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): import("../internal.js").VovkToolNonDerived<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
+    }): import("../index.js").VovkTool<TInput, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
     <TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema: import("../types/validation.js").CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
+    }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
     <TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema: import("../types/validation.js").CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
+    }): import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
     <TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): import("../internal.js").VovkToolNonDerived<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
+    }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("./toModelOutputDefault.js").ToModelOutputDefaultFn ? import("./toModelOutputDefault.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
     <TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: import("../types/validation.js").CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): import("../internal.js").VovkToolNonDerived<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
+    }): import("../index.js").VovkTool<null, TOutput, import("./toModelOutputDefault.js").DefaultModelOutput<TOutput>>;
 };

package/dist/tools/createToolFactory.d.ts

@@ -1,5 +1,5 @@
 import type { VovkValidationType } from '../types/core.js';
-import type { VovkToolNonDerived } from '../types/tools.js';
+import type { VovkTool } from '../types/tools.js';
 import type { DefaultModelOutput, ToModelOutputDefaultFn } from './toModelOutputDefault.js';
 import type { CombinedSpec } from '../types/validation.js';
 import type { KnownAny } from '../types/utils.js';
@@ -15,121 +15,121 @@ export declare function createToolFactory({ toJSONSchema, }: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema: CombinedSpec<TInput, TInput>;
     } & {
         outputSchema: CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
+    }): VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
     <TInput, TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema: CombinedSpec<TInput, TInput>;
     } & {
         outputSchema: CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>;
+    }): VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>;
     <TInput, TOutput, TToModelOutput extends AnyToModelOutputFn>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema: CombinedSpec<TInput, TInput>;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): VovkToolNonDerived<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
+    }): VovkTool<TInput, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
     <TInput, TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema: CombinedSpec<TInput, TInput>;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: TInput, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): VovkToolNonDerived<TInput, TOutput, DefaultModelOutput<TOutput>>;
+    }): VovkTool<TInput, TOutput, DefaultModelOutput<TOutput>>;
     <TOutput, TToModelOutput extends AnyToModelOutputFn>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema: CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
+    }): VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
     <TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema: CombinedSpec<TOutput, TOutput>;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>;
+    }): VovkTool<null, TOutput, DefaultModelOutput<TOutput>>;
     <TOutput, TToModelOutput extends AnyToModelOutputFn>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput: TToModelOutput;
-    }): VovkToolNonDerived<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
+    }): VovkTool<null, TOutput, InferFormattedOutput<TToModelOutput, TOutput>>;
     <TOutput>(options: {
         name: string;
         title?: string;
         description: string;
-        onExecute?: ((result: unknown, tool: VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
-        onError?: ((error: Error, tool: VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onExecute?: ((result: unknown, tool: VovkTool<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
+        onError?: ((error: Error, tool: VovkTool<null, TOutput, DefaultModelOutput<TOutput>>) => void) | undefined;
         target?: CombinedSpec.Target;
     } & {
         inputSchema?: undefined;
     } & {
         outputSchema?: undefined;
     } & {
-        execute: (input: null, processingMeta?: unknown) => TOutput | Promise<TOutput>;
+        execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
         toModelOutput?: undefined;
-    }): VovkToolNonDerived<null, TOutput, DefaultModelOutput<TOutput>>;
+    }): VovkTool<null, TOutput, DefaultModelOutput<TOutput>>;
 };
 export {};

package/dist/tools/deriveTools.d.ts

@@ -1,6 +1,6 @@
 import type { DefaultModelOutput } from './toModelOutputDefault.js';
 import type { VovkRequest } from '../types/request.js';
-import type { VovkToolDerived, ToModelOutputFn } from '../types/tools.js';
+import type { VovkTool, ToModelOutputFn } from '../types/tools.js';
 type DerivedToolInput = {
     body?: unknown;
     query?: unknown;
@@ -9,12 +9,12 @@ type DerivedToolInput = {
 type DeriveToolsBaseOptions<TOutput = unknown, TFormattedOutput = unknown> = {
     modules: Record<string, object>;
     meta?: Record<string, unknown>;
-    onExecute?: (result: unknown, tool: VovkToolDerived<DerivedToolInput, TOutput, TFormattedOutput>, req: Pick<VovkRequest, 'vovk'> | null) => void;
-    onError?: (error: Error, tool: VovkToolDerived<DerivedToolInput, TOutput, TFormattedOutput>, req: Pick<VovkRequest, 'vovk'> | null) => void;
+    onExecute?: (result: unknown, tool: VovkTool<DerivedToolInput, TOutput, TFormattedOutput>, req: Pick<VovkRequest, 'vovk'> | null) => void;
+    onError?: (error: Error, tool: VovkTool<DerivedToolInput, TOutput, TFormattedOutput>, req: Pick<VovkRequest, 'vovk'> | null) => void;
 };
 type DeriveToolsResult<TOutput, TFormattedOutput> = {
-    tools: VovkToolDerived<DerivedToolInput, TOutput, TFormattedOutput>[];
-    toolsByName: Record<string, VovkToolDerived<DerivedToolInput, TOutput, TFormattedOutput>>;
+    tools: VovkTool<DerivedToolInput, TOutput, TFormattedOutput>[];
+    toolsByName: Record<string, VovkTool<DerivedToolInput, TOutput, TFormattedOutput>>;
 };
 /**
  * Derives AI tools from controllers and RPC modules.

package/dist/tools/deriveTools.js

@@ -1,4 +1,5 @@
 import { ToModelOutput } from './ToModelOutput.js';
+import { validationSchemasObjectToSingleValidationSchema } from '../validation/validationSchemasObjectToSingleValidationSchema.js';
 async function caller({ handler, handlerName, body, query, params, meta, toModelOutput }, tool) {
     if (!handler.isRPC && !handler.fn) {
         throw new Error('Handler is not a valid RPC or controller method');
@@ -27,10 +28,7 @@ async function caller({ handler, handlerName, body, query, params, meta, toModel
         else {
             throw new Error(`Unable to call handler "${handlerName}". It's neither RPC nor controller method with "fn" interface.`);
         }
-        return [
-            await toModelOutput(result, tool, req),
-            req,
-        ];
+        return [await toModelOutput(result, tool, req), req];
     }
     catch (e) {
         return [await toModelOutput(e, tool, null), null];
@@ -46,7 +44,8 @@ const makeTool = ({ moduleName, handlerName, module, meta, toModelOutput, onExec
     }
     const { schema, definition } = handler;
     const inputSchemas = Object.fromEntries(['body', 'query', 'params'].map((key) => [key, definition?.[key]]).filter(([, value]) => Boolean(value)));
-    if (!schema || !schema.operationObject) {
+    const inputSchema = Object.keys(inputSchemas).length > 0 ? validationSchemasObjectToSingleValidationSchema(inputSchemas) : undefined;
+    if (!schema?.operationObject) {
         throw new Error(`Handler "${handlerName}" in module "${moduleName}" does not have a valid schema.`);
     }
     const execute = async (input) => {
@@ -93,7 +92,7 @@ const makeTool = ({ moduleName, handlerName, module, meta, toModelOutput, onExec
         type: 'function',
         execute,
         name: schema.operationObject?.['x-tool']?.name ?? `${moduleName}_${handlerName}`,
-        inputSchema: undefined,
+        inputSchema: inputSchema,
         outputSchema: definition?.output,
         title: schema.operationObject?.['x-tool']?.title ?? schema.operationObject?.summary,
         description: schema.operationObject?.['x-tool']?.description ??