vovk 3.0.0-draft.395 → 3.0.0-draft.396

package/cjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
-import type { KnownAny, VovkSchema } from '../types';
+import type { KnownAny } from '../types';
 import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, fetcher?: VovkClientFetcher<OPTS>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, fetcher?: VovkClientFetcher<OPTS>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -17,7 +17,8 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, segmentName, rpcModuleName, fetcher, options) => {
+const createRPC = (givenSchema, segmentName, rpcModuleName, fetcher, options) => {
+    const schema = givenSchema; // fixes incompatibilities with JSON module
     fetcher ??= fetcher_1.fetcher;
     const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];

package/cjs/client/defaultStreamHandler.js

@@ -30,12 +30,14 @@ const defaultStreamHandler = async ({ response, controller, }) => {
             let value;
             try {
                 let done;
+                if (canceled)
+                    break;
                 ({ value, done } = await reader.read());
                 if (done)
                     break;
             }
             catch (error) {
-                await reader.cancel();
+                // await reader.cancel(); // TODO in which cases it needs to be canceled?
                 const err = new Error('JSONLines stream error. ' + String(error));
                 err.cause = error;
                 throw err;
@@ -61,10 +63,12 @@ const defaultStreamHandler = async ({ response, controller, }) => {
                     i++;
                     if ('isError' in data && 'reason' in data) {
                         const upcomingError = data.reason;
-                        await reader.cancel();
+                        canceled = true;
+                        controller.abort(data.reason);
                         if (typeof upcomingError === 'string') {
                             throw new Error(upcomingError);
                         }
+                        controller.abort('Stream disposed');
                         throw upcomingError;
                     }
                     else if (!canceled) {
@@ -74,11 +78,25 @@ const defaultStreamHandler = async ({ response, controller, }) => {
             }
         }
     }
+    const asPromise = async () => {
+        const items = [];
+        for await (const item of asyncIterator()) {
+            items.push(item);
+        }
+        return items;
+    };
     return {
         status: response.status,
+        asPromise,
         [Symbol.asyncIterator]: asyncIterator,
-        [Symbol.dispose]: () => controller.abort(),
-        [Symbol.asyncDispose]: () => controller.abort(),
+        [Symbol.dispose]: () => {
+            canceled = true;
+            controller.abort('Stream disposed');
+        },
+        [Symbol.asyncDispose]: () => {
+            canceled = true;
+            controller.abort('Stream async disposed');
+        },
         onIterate: (cb) => {
             if (canceled)
                 return () => { };
@@ -87,9 +105,9 @@ const defaultStreamHandler = async ({ response, controller, }) => {
                 subscribers.delete(cb);
             };
         },
-        abort: () => {
+        cancel: (reason) => {
             canceled = true;
-            return controller.abort();
+            return controller.abort(reason ?? 'Stream aborted intentionally');
         },
     };
 };

package/cjs/client/fetcher.js

@@ -58,9 +58,9 @@ function createFetcher({ prepareRequestInit, transformResponse, onSuccess, onErr
             else if (body) {
                 requestInit.body = JSON.stringify(body);
             }
-            requestInit = prepareRequestInit ? await prepareRequestInit(requestInit, inputOptions) : requestInit;
             const controller = new AbortController();
             requestInit.signal = controller.signal;
+            requestInit = prepareRequestInit ? await prepareRequestInit(requestInit, inputOptions) : requestInit;
             try {
                 response = await fetch(endpoint, requestInit);
             }

package/cjs/client/types.d.ts

@@ -29,11 +29,12 @@ export type StaticMethodInput<T extends ((req: VovkRequest<KnownAny, KnownAny, K
 type ToPromise<T> = T extends PromiseLike<unknown> ? T : Promise<T>;
 export type VovkStreamAsyncIterable<T> = {
     status: number;
+    asPromise: () => Promise<T[]>;
     [Symbol.dispose](): Promise<void> | void;
     [Symbol.asyncDispose](): Promise<void> | void;
     [Symbol.asyncIterator](): AsyncIterator<T>;
     onIterate: (cb: (data: T, i: number) => void) => () => void;
-    abort: () => Promise<void> | void;
+    cancel: () => Promise<void> | void;
 };
 type StaticMethodReturn<T extends ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? Awaited<ReturnType<T>> : ReturnType<T>;
 type StaticMethodReturnPromise<T extends ControllerStaticMethod> = ToPromise<StaticMethodReturn<T>>;

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 VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkSimpleJSONSchema } 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 VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject } from './types';
 import { type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher, progressive } from './client/index';
 import { openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi/index';
 import { HttpException } from './HttpException';
@@ -12,7 +12,7 @@ import { multitenant } from './utils/multitenant';
 import { createLLMTools } from './utils/createLLMTools';
 import { createCodeExamples } from './utils/createCodeExamples';
 import { createValidateOnClient } from './utils/createValidateOnClient';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, 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 VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkSimpleJSONSchema, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeExamples, createValidateOnClient, progressive, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, 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 VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeExamples, createValidateOnClient, progressive, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
 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/error.js

@@ -31,7 +31,7 @@ const statusDisplayText = {
     [types_1.HttpStatus.METHOD_NOT_ALLOWED]: 'Method Not Allowed',
     [types_1.HttpStatus.NOT_ACCEPTABLE]: 'Not Acceptable',
     [types_1.HttpStatus.PROXY_AUTHENTICATION_REQUIRED]: 'Proxy Authentication Required',
-    [types_1.HttpStatus.REQUEST_TIMEOUT]: 'Request Timeout',
+    [types_1.HttpStatus.TRequest_TIMEOUT]: 'Request Timeout',
     [types_1.HttpStatus.CONFLICT]: 'Conflict',
     [types_1.HttpStatus.GONE]: 'Gone',
     [types_1.HttpStatus.LENGTH_REQUIRED]: 'Length Required',
@@ -39,14 +39,14 @@ const statusDisplayText = {
     [types_1.HttpStatus.PAYLOAD_TOO_LARGE]: 'Payload Too Large',
     [types_1.HttpStatus.URI_TOO_LONG]: 'URI Too Long',
     [types_1.HttpStatus.UNSUPPORTED_MEDIA_TYPE]: 'Unsupported Media Type',
-    [types_1.HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE]: 'Requested Range Not Satisfiable',
+    [types_1.HttpStatus.TRequestED_RANGE_NOT_SATISFIABLE]: 'Requested Range Not Satisfiable',
     [types_1.HttpStatus.EXPECTATION_FAILED]: 'Expectation Failed',
     [types_1.HttpStatus.I_AM_A_TEAPOT]: 'I am a teapot',
     [types_1.HttpStatus.MISDIRECTED]: 'Misdirected',
     [types_1.HttpStatus.UNPROCESSABLE_ENTITY]: 'Unprocessable Entity',
     [types_1.HttpStatus.FAILED_DEPENDENCY]: 'Failed Dependency',
     [types_1.HttpStatus.PRECONDITION_REQUIRED]: 'Precondition Required',
-    [types_1.HttpStatus.TOO_MANY_REQUESTS]: 'Too Many Requests',
+    [types_1.HttpStatus.TOO_MANY_TRequestS]: 'Too Many Requests',
     [types_1.HttpStatus.INTERNAL_SERVER_ERROR]: 'Internal Server Error',
     [types_1.HttpStatus.NOT_IMPLEMENTED]: 'Not Implemented',
     [types_1.HttpStatus.BAD_GATEWAY]: 'Bad Gateway',

package/cjs/openapi/index.d.ts

@@ -1,12 +1,9 @@
-import type { OperationObject } from 'openapi3-ts/oas31';
 import { vovkSchemaToOpenAPI } from './vovkSchemaToOpenAPI';
 import { openAPIToVovkSchema } from './openAPIToVovkSchema/index';
-import type { KnownAny } from '../types';
-type OperationObjectWithCustomProperties = OperationObject & {
-    [key in `${'x' | 'X'}-${string}`]: KnownAny;
-};
-export declare const openapiDecorator: (openAPIOperationObject?: OperationObjectWithCustomProperties | undefined) => (target: KnownAny, propertyKey: string) => void;
-export declare const openapi: ((openAPIOperationObject?: OperationObjectWithCustomProperties | undefined) => (target: KnownAny, propertyKey: string) => void) & {
-    error: (status: import("../types").HttpStatus, message: string) => (target: KnownAny, propertyKey: string) => void;
+import type { VovkOperationObject } from '../types';
+export declare const openapiDecorator: (openAPIOperationObject?: VovkOperationObject | undefined) => (target: import("../types").KnownAny, propertyKey: string) => void;
+export declare const openapi: ((openAPIOperationObject?: VovkOperationObject | undefined) => (target: import("../types").KnownAny, propertyKey: string) => void) & {
+    error: (status: import("../types").HttpStatus, message: string) => (target: import("../types").KnownAny, propertyKey: string) => void;
+    tool: (toolInfo: import("../types").VovkToolInfo) => (target: import("../types").KnownAny, propertyKey: string) => void;
 };
 export { vovkSchemaToOpenAPI, openAPIToVovkSchema };

package/cjs/openapi/index.js

@@ -7,6 +7,7 @@ const index_1 = require("./openAPIToVovkSchema/index");
 Object.defineProperty(exports, "openAPIToVovkSchema", { enumerable: true, get: function () { return index_1.openAPIToVovkSchema; } });
 const error_1 = require("./error");
 const createDecorator_1 = require("../utils/createDecorator");
+const tool_1 = require("./tool");
 exports.openapiDecorator = (0, createDecorator_1.createDecorator)(null, (openAPIOperationObject = {}) => {
     return (handlerSchema) => {
         return {
@@ -18,4 +19,4 @@ exports.openapiDecorator = (0, createDecorator_1.createDecorator)(null, (openAPI
         };
     };
 });
-exports.openapi = Object.assign(exports.openapiDecorator, { error: error_1.error });
+exports.openapi = Object.assign(exports.openapiDecorator, { error: error_1.error, tool: tool_1.tool });

package/cjs/openapi/openAPIToVovkSchema/applyComponentsSchemas.d.ts

@@ -1,3 +1,3 @@
 import { ComponentsObject } from 'openapi3-ts/oas31';
-import { VovkSimpleJSONSchema } from '../../types';
-export declare function applyComponentsSchemas(schema: VovkSimpleJSONSchema, components: ComponentsObject['schemas'], mixinName: string): VovkSimpleJSONSchema | VovkSimpleJSONSchema[];
+import { VovkBasicJSONSchema } from '../../types';
+export declare function applyComponentsSchemas(schema: VovkBasicJSONSchema, components: ComponentsObject['schemas'], mixinName: string): VovkBasicJSONSchema | VovkBasicJSONSchema[];

package/cjs/openapi/tool.d.ts

@@ -0,0 +1,2 @@
+import { VovkToolInfo } from '../types';
+export declare const tool: (toolInfo: VovkToolInfo) => (target: import("../types").KnownAny, propertyKey: string) => void;

package/cjs/openapi/tool.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tool = void 0;
+const createDecorator_1 = require("../utils/createDecorator");
+exports.tool = (0, createDecorator_1.createDecorator)(null, (toolInfo) => {
+    return (handlerSchema) => {
+        return {
+            ...handlerSchema,
+            openapi: {
+                ...handlerSchema?.openapi,
+                ...Object.fromEntries(Object.entries(toolInfo).map(([key, value]) => ['x-tool-' + key, value])),
+            },
+        };
+    };
+});

package/cjs/types.d.ts

@@ -1,38 +1,42 @@
 import type { NextRequest } from 'next/server';
 import type { OpenAPIObject, OperationObject } from 'openapi3-ts/oas31';
 import type { JSONLinesResponse } from './JSONLinesResponse';
-import { VovkStreamAsyncIterable } from './client/types';
+import type { VovkStreamAsyncIterable } from './client/types';
 import type { PackageJson } from 'type-fest';
 import { build } from 'tsdown';
 export type KnownAny = any;
 export type StaticClass = Function;
-export type VovkHandlerSchema<T = KnownAny> = {
+export type VovkHandlerSchema = {
     path: string;
     httpMethod: string;
     validation?: {
-        query?: T;
-        body?: T;
-        params?: T;
-        output?: T;
-        iteration?: T;
+        query?: VovkBasicJSONSchema;
+        body?: VovkBasicJSONSchema;
+        params?: VovkBasicJSONSchema;
+        output?: VovkBasicJSONSchema;
+        iteration?: VovkBasicJSONSchema;
     };
-    openapi?: OperationObject;
+    openapi?: VovkOperationObject;
     misc?: Record<string, KnownAny>;
 };
-export type VovkControllerSchema<T = KnownAny> = {
+export type VovkControllerSchema = {
     rpcModuleName: string;
     originalControllerName?: string;
     prefix?: string;
     forceApiRoot?: string;
-    handlers: Record<string, VovkHandlerSchema<T>>;
+    handlers: {
+        [key: string]: VovkHandlerSchema;
+    };
 };
-export type VovkSegmentSchema<T = KnownAny> = {
+export type VovkSegmentSchema = {
     $schema: typeof VovkSchemaIdEnum.SEGMENT | (string & {});
     emitSchema: boolean;
     segmentName: string;
     segmentType: 'segment' | 'mixin' | (string & {});
     forceApiRoot?: string;
-    controllers: Record<string, VovkControllerSchema<T>>;
+    controllers: {
+        [key: string]: VovkControllerSchema;
+    };
     meta?: {
         components?: OpenAPIObject['components'];
         package?: PackageJson;
@@ -47,9 +51,11 @@ export type VovkMetaSchema = {
     openapi?: OpenAPIObject;
     [key: string]: KnownAny;
 };
-export type VovkSchema<T = KnownAny> = {
+export type VovkSchema = {
     $schema: typeof VovkSchemaIdEnum.SCHEMA | (string & {});
-    segments: Record<string, VovkSegmentSchema<T>>;
+    segments: {
+        [key: string]: VovkSegmentSchema;
+    };
     meta?: VovkMetaSchema;
 };
 export type VovkErrorResponse = {
@@ -194,7 +200,7 @@ export declare enum HttpStatus {
     METHOD_NOT_ALLOWED = 405,
     NOT_ACCEPTABLE = 406,
     PROXY_AUTHENTICATION_REQUIRED = 407,
-    REQUEST_TIMEOUT = 408,
+    TRequest_TIMEOUT = 408,
     CONFLICT = 409,
     GONE = 410,
     LENGTH_REQUIRED = 411,
@@ -202,14 +208,14 @@ export declare enum HttpStatus {
     PAYLOAD_TOO_LARGE = 413,
     URI_TOO_LONG = 414,
     UNSUPPORTED_MEDIA_TYPE = 415,
-    REQUESTED_RANGE_NOT_SATISFIABLE = 416,
+    TRequestED_RANGE_NOT_SATISFIABLE = 416,
     EXPECTATION_FAILED = 417,
     I_AM_A_TEAPOT = 418,
     MISDIRECTED = 421,
     UNPROCESSABLE_ENTITY = 422,
     FAILED_DEPENDENCY = 424,
     PRECONDITION_REQUIRED = 428,
-    TOO_MANY_REQUESTS = 429,
+    TOO_MANY_TRequestS = 429,
     INTERNAL_SERVER_ERROR = 500,
     NOT_IMPLEMENTED = 501,
     BAD_GATEWAY = 502,
@@ -222,13 +228,17 @@ export interface VovkLLMTool {
         body?: KnownAny;
         query?: KnownAny;
         params?: KnownAny;
-    }, options: KnownAny) => Promise<KnownAny>;
+    }, options?: KnownAny) => Promise<KnownAny>;
     name: string;
     description: string;
     parameters?: {
         type: 'object';
-        properties?: Record<string, KnownAny>;
-        required?: string[];
+        properties?: {
+            body?: VovkBasicJSONSchema;
+            query?: VovkBasicJSONSchema;
+            params?: VovkBasicJSONSchema;
+        };
+        required?: ('body' | 'query' | 'params')[];
         additionalProperties?: boolean;
     };
     models: {
@@ -240,24 +250,30 @@ export interface VovkLLMTool {
     } | undefined;
     type: 'function';
 }
-export type VovkSimpleJSONSchema = {
+export type VovkBasicJSONSchema = {
     $schema?: string;
     type?: string | string[];
     format?: string;
     $ref?: string;
-    items?: VovkSimpleJSONSchema;
+    items?: VovkBasicJSONSchema;
     enum?: KnownAny[];
     title?: string;
     description?: string;
-    properties?: Record<string, VovkSimpleJSONSchema>;
+    properties?: {
+        [key: string]: VovkBasicJSONSchema;
+    };
     required?: string[];
     examples?: KnownAny[];
-    $defs?: Record<string, VovkSimpleJSONSchema>;
-    definitions?: Record<string, VovkSimpleJSONSchema>;
+    $defs?: {
+        [key: string]: VovkBasicJSONSchema;
+    };
+    definitions?: {
+        [key: string]: VovkBasicJSONSchema;
+    };
     additionalProperties?: boolean;
-    anyOf?: VovkSimpleJSONSchema[];
-    oneOf?: VovkSimpleJSONSchema[];
-    allOf?: VovkSimpleJSONSchema[];
+    anyOf?: VovkBasicJSONSchema[];
+    oneOf?: VovkBasicJSONSchema[];
+    allOf?: VovkBasicJSONSchema[];
     const?: KnownAny;
     example?: KnownAny;
     contentEncoding?: string;
@@ -266,6 +282,21 @@ export type VovkSimpleJSONSchema = {
     maxLength?: number;
     [key: `x-${string}`]: KnownAny;
 };
+export type VovkOperationObject = OperationObject & {
+    'x-tool-disable'?: boolean;
+    'x-tool-description'?: string;
+    'x-tool-successMessage'?: string;
+    'x-tool-errorMessage'?: string;
+    'x-tool-includeResponse'?: boolean;
+};
+export type VovkToolInfo = {
+    disable?: boolean;
+    description?: string;
+    successMessage?: string;
+    errorMessage?: string;
+    includeResponse?: boolean;
+    [key: string]: KnownAny;
+};
 export declare enum VovkSchemaIdEnum {
     META = "https://vovk.dev/api/schema/v3/meta.json",
     CONFIG = "https://vovk.dev/api/schema/v3/config.json",

package/cjs/types.js

@@ -41,7 +41,7 @@ var HttpStatus;
     HttpStatus[HttpStatus["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
     HttpStatus[HttpStatus["NOT_ACCEPTABLE"] = 406] = "NOT_ACCEPTABLE";
     HttpStatus[HttpStatus["PROXY_AUTHENTICATION_REQUIRED"] = 407] = "PROXY_AUTHENTICATION_REQUIRED";
-    HttpStatus[HttpStatus["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
+    HttpStatus[HttpStatus["TRequest_TIMEOUT"] = 408] = "TRequest_TIMEOUT";
     HttpStatus[HttpStatus["CONFLICT"] = 409] = "CONFLICT";
     HttpStatus[HttpStatus["GONE"] = 410] = "GONE";
     HttpStatus[HttpStatus["LENGTH_REQUIRED"] = 411] = "LENGTH_REQUIRED";
@@ -49,14 +49,14 @@ var HttpStatus;
     HttpStatus[HttpStatus["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
     HttpStatus[HttpStatus["URI_TOO_LONG"] = 414] = "URI_TOO_LONG";
     HttpStatus[HttpStatus["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
-    HttpStatus[HttpStatus["REQUESTED_RANGE_NOT_SATISFIABLE"] = 416] = "REQUESTED_RANGE_NOT_SATISFIABLE";
+    HttpStatus[HttpStatus["TRequestED_RANGE_NOT_SATISFIABLE"] = 416] = "TRequestED_RANGE_NOT_SATISFIABLE";
     HttpStatus[HttpStatus["EXPECTATION_FAILED"] = 417] = "EXPECTATION_FAILED";
     HttpStatus[HttpStatus["I_AM_A_TEAPOT"] = 418] = "I_AM_A_TEAPOT";
     HttpStatus[HttpStatus["MISDIRECTED"] = 421] = "MISDIRECTED";
     HttpStatus[HttpStatus["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
     HttpStatus[HttpStatus["FAILED_DEPENDENCY"] = 424] = "FAILED_DEPENDENCY";
     HttpStatus[HttpStatus["PRECONDITION_REQUIRED"] = 428] = "PRECONDITION_REQUIRED";
-    HttpStatus[HttpStatus["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+    HttpStatus[HttpStatus["TOO_MANY_TRequestS"] = 429] = "TOO_MANY_TRequestS";
     HttpStatus[HttpStatus["INTERNAL_SERVER_ERROR"] = 500] = "INTERNAL_SERVER_ERROR";
     HttpStatus[HttpStatus["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
     HttpStatus[HttpStatus["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";

package/cjs/utils/createCodeExamples.js

@@ -148,7 +148,7 @@ ${outputValidation ? `print(response)\n${getPySample(outputValidation, 0)}` : ''
 function generateRustCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, }) {
     const getRsJSONSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4 });
     const getRsOutputSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: true, indent: indent ?? 4 });
-    /* const getRsFormSample = (schema: VovkSimpleJSONSchema, indent?: number, nesting = 0) => {
+    /* const getRsFormSample = (schema: VovkBasicJSONSchema, indent?: number, nesting = 0) => {
       let formSample = 'let form = multipart::Form::new()';
       for (const [key, prop] of Object.entries(schema.properties || {})) {
         const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;

package/cjs/utils/createDecorator.d.ts

@@ -1,6 +1,6 @@
 import type { VovkHandlerSchema, KnownAny, VovkController, VovkRequest } from '../types';
 type Next = () => Promise<unknown>;
-export declare function createDecorator<ARGS extends unknown[], REQUEST = VovkRequest>(handler: null | ((this: VovkController, req: REQUEST, next: Next, ...args: ARGS) => unknown), initHandler?: (this: VovkController, ...args: ARGS) => Omit<VovkHandlerSchema, 'path' | 'httpMethod'> | ((handlerSchema: VovkHandlerSchema | null, options: {
+export declare function createDecorator<TArgs extends unknown[], TRequest = VovkRequest>(handler: null | ((this: VovkController, req: TRequest, next: Next, ...args: TArgs) => unknown), initHandler?: (this: VovkController, ...args: TArgs) => Omit<VovkHandlerSchema, 'path' | 'httpMethod'> | ((handlerSchema: VovkHandlerSchema | null, options: {
     handlerName: string;
-}) => Omit<Partial<VovkHandlerSchema>, 'path' | 'httpMethod'>) | null | undefined): (...args: ARGS) => (target: KnownAny, propertyKey: string) => void;
+}) => Omit<Partial<VovkHandlerSchema>, 'path' | 'httpMethod'>) | null | undefined): (...args: TArgs) => (target: KnownAny, propertyKey: string) => void;
 export {};

package/cjs/utils/createLLMTools.d.ts

@@ -1,14 +1,14 @@
-import type { KnownAny, VovkHandlerSchema, VovkLLMTool } from '../types';
+import type { KnownAny, VovkHandlerSchema, VovkLLMTool, VovkBasicJSONSchema } from '../types';
 type Handler = ((...args: KnownAny[]) => KnownAny) & {
     fn?: (input: KnownAny) => KnownAny;
     isRPC?: boolean;
     schema?: VovkHandlerSchema;
     models?: {
-        body?: KnownAny;
-        query?: KnownAny;
-        params?: KnownAny;
-        output?: KnownAny;
-        iteration?: KnownAny;
+        body?: VovkBasicJSONSchema;
+        query?: VovkBasicJSONSchema;
+        params?: VovkBasicJSONSchema;
+        output?: VovkBasicJSONSchema;
+        iteration?: VovkBasicJSONSchema;
     };
 };
 type CallerInput = {
@@ -28,17 +28,21 @@ type CallerInput = {
     meta: Record<string, KnownAny> | undefined;
     handlerName: string;
     moduleName: string;
+    resultFormatter: typeof defaultResultFormatter;
 };
-declare function defaultCaller({ handler, body, query, params, init, meta }: CallerInput, _options: KnownAny): Promise<any>;
-export declare function createLLMTools({ modules, caller, meta, onExecute, onError, }: {
+declare function defaultCaller({ handler, body, query, params, init, meta, resultFormatter, schema }: CallerInput, _options: KnownAny): Promise<[any, null] | [any, Error]>;
+declare function defaultResultFormatter(result: KnownAny, _schema: VovkHandlerSchema): Promise<any>;
+export declare function createLLMTools({ modules, caller, meta, resultFormatter, onExecute, onError, }: {
     modules: Record<string, object | [object, {
         init?: RequestInit;
     }]>;
     caller?: typeof defaultCaller;
     meta?: Record<string, KnownAny>;
+    resultFormatter?: typeof defaultResultFormatter | null | 'mcp';
     onExecute?: (result: KnownAny, callerInput: CallerInput, options: KnownAny) => void;
     onError?: (error: Error, callerInput: CallerInput, options: KnownAny) => void;
 }): {
     tools: VovkLLMTool[];
+    toolsByName: Record<string, VovkLLMTool>;
 };
 export {};

package/cjs/utils/createLLMTools.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLLMTools = createLLMTools;
-const createLLMTool = ({ moduleName, handlerName, caller, module, init, meta, onExecute, onError, }) => {
+const createLLMTool = ({ moduleName, handlerName, caller, module, init, meta, resultFormatter, onExecute, onError, }) => {
     if (!module) {
         throw new Error(`Module "${moduleName}" not found.`);
     }
@@ -13,7 +13,7 @@ const createLLMTool = ({ moduleName, handlerName, caller, module, init, meta, on
     if (!schema || !schema.openapi) {
         throw new Error(`Handler "${handlerName}" in module "${moduleName}" does not have a valid schema.`);
     }
-    const execute = (input, options) => {
+    const execute = async (input, options) => {
         const { body, query, params } = input;
         const callerInput = {
             schema,
@@ -26,10 +26,16 @@ const createLLMTool = ({ moduleName, handlerName, caller, module, init, meta, on
             meta,
             handlerName,
             moduleName,
+            resultFormatter,
         };
-        return caller(callerInput, options)
-            .then((data) => onExecute(data, callerInput, options) ?? data)
-            .catch((error) => onError?.(error, callerInput, options) ?? error);
+        const [result, error] = await caller(callerInput, options);
+        if (error) {
+            onError?.(error, callerInput, options);
+        }
+        else {
+            onExecute(result, callerInput, options);
+        }
+        return result;
     };
     const parametersProperties = {
         ...(schema?.validation?.body
@@ -63,30 +69,63 @@ const createLLMTool = ({ moduleName, handlerName, caller, module, init, meta, on
         models,
     };
 };
-async function defaultCaller({ handler, body, query, params, init, meta }, 
+async function defaultCaller({ handler, body, query, params, init, meta, resultFormatter, schema }, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 _options) {
-    if (handler.isRPC) {
-        return handler({
-            handler,
-            body,
-            query,
-            params,
-            init,
-            meta,
-        });
+    if (!handler.isRPC && !handler.fn) {
+        throw new Error('Handler is not a valid RPC or controller method');
     }
-    if (handler.fn) {
-        return handler.fn({
-            body,
-            query,
-            params,
-            meta,
-        });
+    try {
+        let result;
+        if (handler.isRPC) {
+            result = await handler({
+                handler,
+                body,
+                query,
+                params,
+                init,
+                meta,
+            });
+        }
+        if (handler.fn) {
+            result = await handler.fn({
+                body,
+                query,
+                params,
+                meta,
+            });
+        }
+        return [resultFormatter(result, schema), null];
+    }
+    catch (e) {
+        return [resultFormatter(e, schema), e];
     }
-    throw new Error('Handler is not a valid RPC or controller method');
 }
-function createLLMTools({ modules, caller = defaultCaller, meta, onExecute = (result) => result, onError = () => { }, }) {
+async function mcpResultFormatter(result, schema) {
+    const successMessage = schema?.openapi?.['x-tool-successMessage'] ?? 'Tool executed successfully.';
+    const errorMessage = schema?.openapi?.['x-tool-errorMessage'] ?? 'An error occurred while executing the tool.';
+    const includeResponse = schema?.openapi?.['x-tool-includeResponse'] ?? true;
+    return {
+        content: [
+            {
+                type: 'text',
+                text: [
+                    result instanceof Error ? errorMessage : successMessage,
+                    includeResponse
+                        ? `${result instanceof Error ? 'Error' : 'Result'}:\n${JSON.stringify(result, null, 2)}`
+                        : null,
+                ]
+                    .filter(Boolean)
+                    .join('\n\n'),
+            },
+        ],
+    };
+}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function defaultResultFormatter(result, _schema) {
+    return result;
+}
+function createLLMTools({ modules, caller = defaultCaller, meta, resultFormatter, onExecute = (result) => result, onError = () => { }, }) {
     const moduleWithConfig = modules;
     const tools = Object.entries(moduleWithConfig ?? {})
         .map(([moduleName, moduleWithconfig]) => {
@@ -99,7 +138,7 @@ function createLLMTools({ modules, caller = defaultCaller, meta, onExecute = (re
             module = moduleWithconfig;
         }
         return Object.entries(module ?? {})
-            .filter(([, handler]) => handler?.schema?.openapi && !handler?.schema?.openapi?.['x-tool-exclude'])
+            .filter(([, handler]) => handler?.schema?.openapi && !handler?.schema?.openapi?.['x-tool-disable'])
             .map(([handlerName]) => createLLMTool({
             moduleName,
             handlerName,
@@ -107,12 +146,19 @@ function createLLMTools({ modules, caller = defaultCaller, meta, onExecute = (re
             module,
             init,
             meta,
+            resultFormatter: resultFormatter
+                ? resultFormatter === 'mcp'
+                    ? mcpResultFormatter
+                    : resultFormatter
+                : defaultResultFormatter,
             onExecute,
             onError,
         }));
     })
         .flat();
+    const toolsByName = Object.fromEntries(tools.map((tool) => [tool.name, tool]));
     return {
         tools,
+        toolsByName,
     };
 }