vovk 3.0.0-draft.190 → 3.0.0-draft.192

package/cjs/index.d.ts

@@ -1,7 +1,7 @@
 import { createVovkApp } from './createVovkApp.js';
-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 VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction } from './types.js';
+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 VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, type VovkTypedMethod } from './types.js';
 import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher } from './client/index.js';
-import { openapi, openAPIToSchema, schemaToOpenAPI } from './openapi/index.js';
+import { openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi/index.js';
 import { HttpException } from './HttpException.js';
 import { createDecorator } from './utils/createDecorator.js';
 import { JSONLinesResponse } from './JSONLinesResponse.js';
@@ -10,7 +10,7 @@ import { withValidation } from './utils/withValidation.js';
 import { multitenant } from './utils/multitenant.js';
 import { createLLMFunctions } from './utils/createLLMFunctions.js';
 import { createCodeExamples } from './utils/createCodeExamples.js';
-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 VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, createLLMFunctions, createCodeExamples, openapi, openAPIToSchema, schemaToOpenAPI, };
+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 VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, type VovkTypedMethod, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, createLLMFunctions, createCodeExamples, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types.js").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.schemaToOpenAPI = exports.openAPIToSchema = exports.openapi = exports.createCodeExamples = exports.createLLMFunctions = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.vovkSchemaToOpenAPI = exports.openAPIToVovkSchema = exports.openapi = exports.createCodeExamples = exports.createLLMFunctions = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
 const createVovkApp_js_1 = require("./createVovkApp.js");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_js_1.createVovkApp; } });
 const types_js_1 = require("./types.js");
@@ -14,8 +14,8 @@ Object.defineProperty(exports, "fetcher", { enumerable: true, get: function () {
 Object.defineProperty(exports, "createFetcher", { enumerable: true, get: function () { return index_js_1.createFetcher; } });
 const index_js_2 = require("./openapi/index.js");
 Object.defineProperty(exports, "openapi", { enumerable: true, get: function () { return index_js_2.openapi; } });
-Object.defineProperty(exports, "openAPIToSchema", { enumerable: true, get: function () { return index_js_2.openAPIToSchema; } });
-Object.defineProperty(exports, "schemaToOpenAPI", { enumerable: true, get: function () { return index_js_2.schemaToOpenAPI; } });
+Object.defineProperty(exports, "openAPIToVovkSchema", { enumerable: true, get: function () { return index_js_2.openAPIToVovkSchema; } });
+Object.defineProperty(exports, "vovkSchemaToOpenAPI", { enumerable: true, get: function () { return index_js_2.vovkSchemaToOpenAPI; } });
 const HttpException_js_1 = require("./HttpException.js");
 Object.defineProperty(exports, "HttpException", { enumerable: true, get: function () { return HttpException_js_1.HttpException; } });
 const createDecorator_js_1 = require("./utils/createDecorator.js");

package/cjs/openapi/index.d.ts

@@ -1,6 +1,6 @@
 import type { OperationObject } from 'openapi3-ts/oas31';
-import { schemaToOpenAPI } from './schemaToOpenAPI';
-import { openAPIToSchema } from './openAPIToSchema';
+import { vovkSchemaToOpenAPI } from './vovkSchemaToOpenAPI';
+import { openAPIToVovkSchema } from './openAPIToVovkSchema';
 import { error } from './error';
 import type { KnownAny } from '../types';
 type OperationObjectWithCustomProperties = OperationObject & {
@@ -10,4 +10,4 @@ export declare const openapiDecorator: (openAPIOperationObject?: OperationObject
 export declare const openapi: typeof openapiDecorator & {
     error: typeof error;
 };
-export { schemaToOpenAPI, openAPIToSchema };
+export { vovkSchemaToOpenAPI, openAPIToVovkSchema };

package/cjs/openapi/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAPIToSchema = exports.schemaToOpenAPI = exports.openapi = exports.openapiDecorator = void 0;
-const schemaToOpenAPI_1 = require("./schemaToOpenAPI");
-Object.defineProperty(exports, "schemaToOpenAPI", { enumerable: true, get: function () { return schemaToOpenAPI_1.schemaToOpenAPI; } });
-const openAPIToSchema_1 = require("./openAPIToSchema");
-Object.defineProperty(exports, "openAPIToSchema", { enumerable: true, get: function () { return openAPIToSchema_1.openAPIToSchema; } });
+exports.openAPIToVovkSchema = exports.vovkSchemaToOpenAPI = exports.openapi = exports.openapiDecorator = void 0;
+const vovkSchemaToOpenAPI_1 = require("./vovkSchemaToOpenAPI");
+Object.defineProperty(exports, "vovkSchemaToOpenAPI", { enumerable: true, get: function () { return vovkSchemaToOpenAPI_1.vovkSchemaToOpenAPI; } });
+const openAPIToVovkSchema_1 = require("./openAPIToVovkSchema");
+Object.defineProperty(exports, "openAPIToVovkSchema", { enumerable: true, get: function () { return openAPIToVovkSchema_1.openAPIToVovkSchema; } });
 const error_1 = require("./error");
 const createDecorator_1 = require("../utils/createDecorator");
 exports.openapiDecorator = (0, createDecorator_1.createDecorator)(null, (openAPIOperationObject = {}) => {

package/cjs/openapi/openAPIToSchema.d.ts

@@ -7,7 +7,7 @@ declare const defaultGetHandlerInfo: ({ method, path, operation, defaultModuleNa
     openAPIObject: OpenAPIObject;
     defaultModuleName: string;
 }) => [string, string];
-export declare function openAPIToSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
+export declare function openAPIToVovkSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
     openAPIObject: OpenAPIObject;
     getHandlerInfo?: typeof defaultGetHandlerInfo;
     defaultModuleName?: string;

package/cjs/openapi/openAPIToSchema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAPIToSchema = openAPIToSchema;
+exports.openAPIToVovkSchema = openAPIToVovkSchema;
 const types_1 = require("../types");
 const generateFnName_1 = require("./generateFnName");
 function applyComponents(schema, components) {
@@ -66,7 +66,7 @@ const defaultGetHandlerInfo = ({ method, path, operation, defaultModuleName, })
         : controllerName;
     return [rpcModuleName, handlerName];
 };
-function openAPIToSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
+function openAPIToVovkSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
     const schema = {
         $schema: types_1.VovkSchemaIdEnum.SCHEMA,
         segments: {

package/cjs/openapi/openAPIToVovkSchema.d.ts

@@ -0,0 +1,15 @@
+import type { OpenAPIObject, OperationObject } from 'openapi3-ts/oas31';
+import { HttpMethod, type VovkSchema } from '../types';
+declare const defaultGetHandlerInfo: ({ method, path, operation, defaultModuleName, }: {
+    method: HttpMethod;
+    path: string;
+    operation: OperationObject;
+    openAPIObject: OpenAPIObject;
+    defaultModuleName: string;
+}) => [string, string];
+export declare function openAPIToVovkSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
+    openAPIObject: OpenAPIObject;
+    getHandlerInfo?: typeof defaultGetHandlerInfo;
+    defaultModuleName?: string;
+}): VovkSchema;
+export {};

package/cjs/openapi/openAPIToVovkSchema.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openAPIToVovkSchema = openAPIToVovkSchema;
+const types_1 = require("../types");
+const generateFnName_1 = require("./generateFnName");
+function applyComponents(schema, components) {
+    if (!components || !Object.keys(components).length)
+        return schema;
+    // Create a deep copy of the schema
+    const result = JSON.parse(JSON.stringify(schema));
+    // Initialize $defs if it doesn't exist
+    result.$defs = result.$defs || {};
+    // Set to track components we've added to $defs
+    const addedComponents = new Set();
+    // Process a schema object and replace $refs
+    function processSchema(obj) {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        // Create a new object/array to avoid modifying the input
+        const newObj = Array.isArray(obj) ? [...obj] : { ...obj };
+        // Check for $ref
+        if (newObj.$ref && typeof newObj.$ref === 'string' && newObj.$ref.startsWith('#/components/schemas/')) {
+            const componentName = newObj.$ref.replace('#/components/schemas/', '');
+            newObj.$ref = `#/$defs/${componentName}`;
+            // Add the component to $defs if not already added
+            if (!addedComponents.has(componentName) && components[componentName]) {
+                addedComponents.add(componentName);
+                result.$defs[componentName] = processSchema(JSON.parse(JSON.stringify(components[componentName])));
+            }
+        }
+        // Process properties/items recursively
+        if (Array.isArray(newObj)) {
+            for (let i = 0; i < newObj.length; i++) {
+                newObj[i] = processSchema(newObj[i]);
+            }
+        }
+        else {
+            for (const key in newObj) {
+                if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+                    newObj[key] = processSchema(newObj[key]);
+                }
+            }
+        }
+        return newObj;
+    }
+    // Process the main schema
+    return processSchema(result);
+}
+function snakeToCamel(str) {
+    return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+}
+const defaultGetHandlerInfo = ({ method, path, operation, defaultModuleName, }) => {
+    const operationId = operation.operationId?.replace(/[^a-zA-Z0-9_]/g, '_') ?? null;
+    const controllerHandlerMatch = operationId?.match(/^([A-Z][a-zA-Z0-9]*)_([a-zA-Z0-9_]+)/);
+    const isSnakeCase = operationId && /^[a-z][a-z0-9_]+$/.test(operationId);
+    const [controllerName, handlerName] = controllerHandlerMatch?.slice(1, 3) ?? [
+        defaultModuleName,
+        isSnakeCase
+            ? snakeToCamel(operationId)
+            : operationId?.match(/^[a-zA-Z][a-zA-Z0-9_]+$/)
+                ? operationId
+                : (0, generateFnName_1.generateFnName)(method, path),
+    ];
+    const rpcModuleName = controllerName.endsWith('Controller')
+        ? controllerName.replace(/Controller$/, 'RPC')
+        : controllerName;
+    return [rpcModuleName, handlerName];
+};
+function openAPIToVovkSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
+    const schema = {
+        $schema: types_1.VovkSchemaIdEnum.SCHEMA,
+        segments: {
+            '': {
+                $schema: types_1.VovkSchemaIdEnum.SEGMENT,
+                emitSchema: true,
+                segmentName: '',
+                controllers: {},
+            },
+        },
+        meta: {
+            $schema: types_1.VovkSchemaIdEnum.META,
+            config: {
+                $schema: types_1.VovkSchemaIdEnum.CONFIG,
+            },
+            openapi: openAPIObject,
+        },
+    };
+    const segment = schema.segments[''];
+    return Object.entries(openAPIObject.paths ?? {}).reduce((acc, [path, operations]) => {
+        Object.entries(operations).forEach(([method, operation]) => {
+            const [rpcModuleName, handlerName] = getHandlerInfo({
+                method: method.toUpperCase(),
+                path,
+                operation,
+                openAPIObject,
+                defaultModuleName,
+            });
+            segment.controllers[rpcModuleName] ??= {
+                rpcModuleName,
+                handlers: {},
+            };
+            // TODO how to utilize ReferenceObject?
+            const queryProperties = operation.parameters?.filter((p) => p.in === 'query') || [];
+            const pathProperties = operation.parameters?.filter((p) => p.in === 'path') || [];
+            const query = Array.isArray(operation.parameters)
+                ? {
+                    type: 'object',
+                    properties: Object.fromEntries(queryProperties.map((p) => [p.name, p.schema])),
+                    required: queryProperties.filter((p) => p.required).map((p) => p.name),
+                }
+                : null;
+            const params = Array.isArray(pathProperties)
+                ? {
+                    type: 'object',
+                    properties: Object.fromEntries(pathProperties.map((p) => [p.name, p.schema])),
+                    required: pathProperties.filter((p) => p.required).map((p) => p.name),
+                }
+                : null;
+            // TODO how to utilize ReferenceObject?
+            const body = operation.requestBody?.content['application/json']?.schema ?? null;
+            const output = operation.responses?.['200']?.content?.['application/json']?.schema ??
+                operation.responses?.['201']?.content?.['application/json']?.schema ??
+                null;
+            segment.controllers[rpcModuleName].handlers[handlerName] = {
+                httpMethod: method.toUpperCase(),
+                path,
+                openapi: operation,
+                validation: {
+                    ...(query && { query: applyComponents(query, openAPIObject.components?.schemas) }),
+                    ...(params && { params: applyComponents(params, openAPIObject.components?.schemas) }),
+                    ...(body && { body: applyComponents(body, openAPIObject.components?.schemas) }),
+                    ...(output && { output: applyComponents(output, openAPIObject.components?.schemas) }),
+                },
+            };
+        });
+        return acc;
+    }, schema);
+}

package/cjs/openapi/schemaToOpenAPI.d.ts

@@ -1,7 +1,7 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 import { type CodeSamplePackageJson } from '../utils/createCodeExamples';
 import { type VovkSchema } from '../types';
-export declare function schemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
+export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
     rootEntry: string;
     schema: VovkSchema;
     openAPIObject?: Partial<OpenAPIObject>;

package/cjs/openapi/schemaToOpenAPI.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schemaToOpenAPI = schemaToOpenAPI;
+exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
 const json_schema_sampler_1 = require("@stoplight/json-schema-sampler");
 const createCodeExamples_1 = require("../utils/createCodeExamples");
 const types_1 = require("../types");
@@ -43,7 +43,7 @@ function extractComponents(schema) {
     const processedSchema = process(schema);
     return [processedSchema, components];
 }
-function schemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
     const paths = {};
     const components = {};
     for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments)) {

package/cjs/openapi/vovkSchemaToOpenAPI.d.ts

@@ -0,0 +1,9 @@
+import type { OpenAPIObject } from 'openapi3-ts/oas31';
+import { type CodeSamplePackageJson } from '../utils/createCodeExamples';
+import { type VovkSchema } from '../types';
+export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
+    rootEntry: string;
+    schema: VovkSchema;
+    openAPIObject?: Partial<OpenAPIObject>;
+    package?: CodeSamplePackageJson;
+}): OpenAPIObject;

package/cjs/openapi/vovkSchemaToOpenAPI.js

@@ -0,0 +1,237 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
+const json_schema_sampler_1 = require("@stoplight/json-schema-sampler");
+const createCodeExamples_1 = require("../utils/createCodeExamples");
+const types_1 = require("../types");
+function extractComponents(schema) {
+    if (!schema)
+        return [undefined, {}];
+    const components = {};
+    // Function to collect components and replace $refs recursively
+    const process = (obj, path = []) => {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        // Handle arrays
+        if (Array.isArray(obj)) {
+            return obj.map((item) => process(item, path));
+        }
+        // Create a copy to modify
+        const result = {};
+        Object.entries({ ...obj.definitions, ...obj.$defs }).forEach(([key, value]) => {
+            components[key] = process(value, [...path, key]);
+        });
+        // Process all properties
+        for (const [key, value] of Object.entries(obj)) {
+            // Skip already processed special properties
+            if (key === '$defs' || key === 'definitions')
+                continue;
+            if (key === '$ref' && typeof value === 'string') {
+                // Extract the component name from the reference
+                const refParts = value.split('/');
+                const refName = refParts[refParts.length - 1];
+                // Replace with component reference
+                result[key] = `#/components/schemas/${refName}`;
+            }
+            else {
+                // Recursively process other properties
+                result[key] = process(value, [...path, key]);
+            }
+        }
+        return result;
+    };
+    const processedSchema = process(schema);
+    return [processedSchema, components];
+}
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
+    const paths = {};
+    const components = {};
+    for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments)) {
+        for (const c of Object.values(segmentSchema.controllers)) {
+            for (const [handlerName, h] of Object.entries(c.handlers)) {
+                if (h.openapi) {
+                    const [queryValidation, queryComponents] = extractComponents(h?.validation?.query);
+                    const [bodyValidation, bodyComponents] = extractComponents(h?.validation?.body);
+                    const [paramsValidation, paramsComponents] = extractComponents(h?.validation?.params);
+                    const [outputValidation, outputComponents] = extractComponents(h?.validation?.output);
+                    const [iterationValidation, iterationComponents] = extractComponents(h?.validation?.iteration);
+                    // TODO: Handle name conflicts?
+                    Object.assign(components, queryComponents, bodyComponents, paramsComponents, outputComponents, iterationComponents);
+                    const { ts, rs, py } = (0, createCodeExamples_1.createCodeExamples)({
+                        package: packageJson,
+                        handlerName,
+                        handlerSchema: h,
+                        controllerSchema: c,
+                    });
+                    const queryParameters = queryValidation && 'type' in queryValidation && 'properties' in queryValidation
+                        ? Object.entries(queryValidation.properties).map(([propName, propSchema]) => ({
+                            name: propName,
+                            in: 'query',
+                            required: queryValidation.required ? queryValidation.required.includes(propName) : false,
+                            schema: propSchema,
+                        }))
+                        : null;
+                    const pathParameters = paramsValidation && 'type' in paramsValidation && 'properties' in paramsValidation
+                        ? Object.entries(paramsValidation.properties).map(([propName, propSchema]) => ({
+                            name: propName,
+                            in: 'path',
+                            required: paramsValidation.required ? paramsValidation.required.includes(propName) : false,
+                            schema: propSchema,
+                        }))
+                        : null;
+                    const path = '/' +
+                        [rootEntry.replace(/^\/+|\/+$/g, ''), segmentName, c.prefix, h.path]
+                            .filter(Boolean)
+                            .join('/')
+                            .replace(/:([a-zA-Z0-9_]+)/g, '{$1}');
+                    paths[path] = paths[path] ?? {};
+                    const httpMethod = h.httpMethod.toLowerCase();
+                    paths[path][httpMethod] ??= {};
+                    paths[path][httpMethod] = {
+                        ...h.openapi,
+                        ...paths[path][httpMethod],
+                        'x-codeSamples': [
+                            ...(paths[path][httpMethod]['x-codeSamples'] ?? []),
+                            ...(h.openapi['x-codeSamples'] ?? []),
+                            {
+                                label: 'TypeScript RPC',
+                                lang: 'typescript',
+                                source: ts,
+                            },
+                            {
+                                label: 'Python RPC',
+                                lang: 'python',
+                                source: py,
+                            },
+                            {
+                                label: 'Rust RPC',
+                                lang: 'rust',
+                                source: rs,
+                            },
+                        ],
+                        ...(queryParameters || pathParameters
+                            ? {
+                                parameters: h.openapi.parameters ?? [...(queryParameters || []), ...(pathParameters || [])],
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].parameters
+                            ? {
+                                parameters: paths[path][httpMethod].parameters,
+                            }
+                            : {}),
+                        ...(outputValidation && 'type' in outputValidation && 'properties' in outputValidation
+                            ? {
+                                responses: {
+                                    200: {
+                                        description: 'description' in outputValidation ? outputValidation.description : 'Success',
+                                        content: {
+                                            'application/json': {
+                                                schema: outputValidation,
+                                            },
+                                        },
+                                    },
+                                    ...h.openapi?.responses,
+                                },
+                            }
+                            : {}),
+                        ...(iterationValidation && 'type' in iterationValidation && 'properties' in iterationValidation
+                            ? {
+                                responses: {
+                                    200: {
+                                        description: 'description' in iterationValidation ? iterationValidation.description : 'JSON Lines response',
+                                        content: {
+                                            'application/jsonl': {
+                                                schema: {
+                                                    ...iterationValidation,
+                                                    examples: iterationValidation.examples ?? [
+                                                        [
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                        ].join('\n'),
+                                                    ],
+                                                },
+                                            },
+                                        },
+                                    },
+                                    ...h.openapi?.responses,
+                                },
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].responses
+                            ? {
+                                responses: paths[path][httpMethod].responses,
+                            }
+                            : {}),
+                        ...(bodyValidation && 'type' in bodyValidation && 'properties' in bodyValidation
+                            ? {
+                                requestBody: h.openapi?.requestBody ?? {
+                                    description: 'description' in bodyValidation ? bodyValidation.description : 'Request body',
+                                    required: true,
+                                    content: {
+                                        'application/json': {
+                                            schema: bodyValidation,
+                                        },
+                                    },
+                                },
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].requestBody
+                            ? {
+                                requestBody: paths[path][httpMethod].requestBody,
+                            }
+                            : {}),
+                        tags: paths[path][httpMethod].tags ?? h.openapi?.tags,
+                    };
+                }
+            }
+        }
+    }
+    return {
+        ...openAPIObject,
+        openapi: '3.1.0',
+        info: {
+            title: packageJson?.description ?? 'API',
+            version: packageJson?.version ?? '0.0.1',
+            ...openAPIObject?.info,
+        },
+        components: {
+            schemas: {
+                ...(openAPIObject?.components?.schemas ?? components),
+                HttpStatus: {
+                    type: 'integer',
+                    description: 'HTTP status code',
+                    enum: Object.keys(types_1.HttpStatus)
+                        .map((k) => types_1.HttpStatus[k])
+                        .filter(Boolean)
+                        .filter((v) => typeof v === 'number'),
+                },
+                VovkErrorResponse: {
+                    type: 'object',
+                    description: 'Vovk error response',
+                    properties: {
+                        cause: {
+                            description: 'Error cause of any shape',
+                        },
+                        statusCode: {
+                            $ref: '#/components/schemas/HttpStatus',
+                        },
+                        message: {
+                            type: 'string',
+                            description: 'Error message',
+                        },
+                        isError: {
+                            type: 'boolean',
+                            const: true,
+                            description: 'Indicates that this object represents an error',
+                        },
+                    },
+                    required: ['statusCode', 'message', 'isError'],
+                    additionalProperties: false,
+                },
+                ...openAPIObject?.components?.schemas,
+            },
+        },
+        paths,
+    };
+}

package/cjs/types.d.ts

@@ -96,6 +96,16 @@ export type ControllerStaticMethod<REQ extends VovkRequest<KnownAny, KnownAny> =
 } = KnownAny> = ((req: REQ, params: PARAMS) => unknown) & {
     _controller?: VovkController;
 };
+export type VovkTypedMethod<T extends (...args: KnownAny[]) => KnownAny, B = KnownAny, Q = KnownAny, P = KnownAny, O = KnownAny, I = KnownAny> = T & {
+    __types: {
+        body?: B;
+        query?: Q;
+        params?: P;
+        output?: O;
+        iteration?: I;
+    };
+    isRPC?: boolean;
+};
 export type VovkControllerBody<T extends (...args: KnownAny) => KnownAny> = Awaited<ReturnType<Parameters<T>[0]['vovk']['body']>>;
 export type VovkControllerQuery<T extends (...args: KnownAny) => KnownAny> = ReturnType<Parameters<T>[0]['vovk']['query']>;
 export type VovkControllerParams<T extends (...args: KnownAny) => KnownAny> = Parameters<T>[1] extends object ? Parameters<T>[1] : ReturnType<Parameters<T>[0]['vovk']['params']>;

package/cjs/utils/withValidation.d.ts

@@ -1,14 +1,6 @@
-import { VovkHandlerSchema, VovkValidationType, type KnownAny, type VovkRequest } from '../types.js';
+import { VovkHandlerSchema, VovkTypedMethod, VovkValidationType, type KnownAny, type VovkRequest } from '../types.js';
 type VovkRequestAny = VovkRequest<KnownAny, KnownAny, KnownAny>;
-export declare function withValidation<T extends ((req: KnownAny, params: KnownAny) => KnownAny) & {
-    __types: {
-        body: KnownAny;
-        query: KnownAny;
-        params: KnownAny;
-        output: KnownAny;
-        iteration: KnownAny;
-    };
-}, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }: {
+export declare function withValidation<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }: {
     disableServerSideValidation?: boolean | VovkValidationType[];
     skipSchemaEmission?: boolean | VovkValidationType[];
     validateEachIteration?: boolean;

package/mjs/index.d.ts

@@ -1,7 +1,7 @@
 import { createVovkApp } from './createVovkApp.js';
-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 VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction } from './types.js';
+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 VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, type VovkTypedMethod } from './types.js';
 import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher } from './client/index.js';
-import { openapi, openAPIToSchema, schemaToOpenAPI } from './openapi/index.js';
+import { openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi/index.js';
 import { HttpException } from './HttpException.js';
 import { createDecorator } from './utils/createDecorator.js';
 import { JSONLinesResponse } from './JSONLinesResponse.js';
@@ -10,7 +10,7 @@ import { withValidation } from './utils/withValidation.js';
 import { multitenant } from './utils/multitenant.js';
 import { createLLMFunctions } from './utils/createLLMFunctions.js';
 import { createCodeExamples } from './utils/createCodeExamples.js';
-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 VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, createLLMFunctions, createCodeExamples, openapi, openAPIToSchema, schemaToOpenAPI, };
+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 VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMFunction, type VovkTypedMethod, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, createLLMFunctions, createCodeExamples, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types.js").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/mjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.schemaToOpenAPI = exports.openAPIToSchema = exports.openapi = exports.createCodeExamples = exports.createLLMFunctions = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.vovkSchemaToOpenAPI = exports.openAPIToVovkSchema = exports.openapi = exports.createCodeExamples = exports.createLLMFunctions = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
 const createVovkApp_js_1 = require("./createVovkApp.js");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_js_1.createVovkApp; } });
 const types_js_1 = require("./types.js");
@@ -14,8 +14,8 @@ Object.defineProperty(exports, "fetcher", { enumerable: true, get: function () {
 Object.defineProperty(exports, "createFetcher", { enumerable: true, get: function () { return index_js_1.createFetcher; } });
 const index_js_2 = require("./openapi/index.js");
 Object.defineProperty(exports, "openapi", { enumerable: true, get: function () { return index_js_2.openapi; } });
-Object.defineProperty(exports, "openAPIToSchema", { enumerable: true, get: function () { return index_js_2.openAPIToSchema; } });
-Object.defineProperty(exports, "schemaToOpenAPI", { enumerable: true, get: function () { return index_js_2.schemaToOpenAPI; } });
+Object.defineProperty(exports, "openAPIToVovkSchema", { enumerable: true, get: function () { return index_js_2.openAPIToVovkSchema; } });
+Object.defineProperty(exports, "vovkSchemaToOpenAPI", { enumerable: true, get: function () { return index_js_2.vovkSchemaToOpenAPI; } });
 const HttpException_js_1 = require("./HttpException.js");
 Object.defineProperty(exports, "HttpException", { enumerable: true, get: function () { return HttpException_js_1.HttpException; } });
 const createDecorator_js_1 = require("./utils/createDecorator.js");

package/mjs/openapi/index.d.ts

@@ -1,6 +1,6 @@
 import type { OperationObject } from 'openapi3-ts/oas31';
-import { schemaToOpenAPI } from './schemaToOpenAPI';
-import { openAPIToSchema } from './openAPIToSchema';
+import { vovkSchemaToOpenAPI } from './vovkSchemaToOpenAPI';
+import { openAPIToVovkSchema } from './openAPIToVovkSchema';
 import { error } from './error';
 import type { KnownAny } from '../types';
 type OperationObjectWithCustomProperties = OperationObject & {
@@ -10,4 +10,4 @@ export declare const openapiDecorator: (openAPIOperationObject?: OperationObject
 export declare const openapi: typeof openapiDecorator & {
     error: typeof error;
 };
-export { schemaToOpenAPI, openAPIToSchema };
+export { vovkSchemaToOpenAPI, openAPIToVovkSchema };

package/mjs/openapi/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAPIToSchema = exports.schemaToOpenAPI = exports.openapi = exports.openapiDecorator = void 0;
-const schemaToOpenAPI_1 = require("./schemaToOpenAPI");
-Object.defineProperty(exports, "schemaToOpenAPI", { enumerable: true, get: function () { return schemaToOpenAPI_1.schemaToOpenAPI; } });
-const openAPIToSchema_1 = require("./openAPIToSchema");
-Object.defineProperty(exports, "openAPIToSchema", { enumerable: true, get: function () { return openAPIToSchema_1.openAPIToSchema; } });
+exports.openAPIToVovkSchema = exports.vovkSchemaToOpenAPI = exports.openapi = exports.openapiDecorator = void 0;
+const vovkSchemaToOpenAPI_1 = require("./vovkSchemaToOpenAPI");
+Object.defineProperty(exports, "vovkSchemaToOpenAPI", { enumerable: true, get: function () { return vovkSchemaToOpenAPI_1.vovkSchemaToOpenAPI; } });
+const openAPIToVovkSchema_1 = require("./openAPIToVovkSchema");
+Object.defineProperty(exports, "openAPIToVovkSchema", { enumerable: true, get: function () { return openAPIToVovkSchema_1.openAPIToVovkSchema; } });
 const error_1 = require("./error");
 const createDecorator_1 = require("../utils/createDecorator");
 exports.openapiDecorator = (0, createDecorator_1.createDecorator)(null, (openAPIOperationObject = {}) => {

package/mjs/openapi/openAPIToSchema.d.ts

@@ -7,7 +7,7 @@ declare const defaultGetHandlerInfo: ({ method, path, operation, defaultModuleNa
     openAPIObject: OpenAPIObject;
     defaultModuleName: string;
 }) => [string, string];
-export declare function openAPIToSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
+export declare function openAPIToVovkSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
     openAPIObject: OpenAPIObject;
     getHandlerInfo?: typeof defaultGetHandlerInfo;
     defaultModuleName?: string;

package/mjs/openapi/openAPIToSchema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAPIToSchema = openAPIToSchema;
+exports.openAPIToVovkSchema = openAPIToVovkSchema;
 const types_1 = require("../types");
 const generateFnName_1 = require("./generateFnName");
 function applyComponents(schema, components) {
@@ -66,7 +66,7 @@ const defaultGetHandlerInfo = ({ method, path, operation, defaultModuleName, })
         : controllerName;
     return [rpcModuleName, handlerName];
 };
-function openAPIToSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
+function openAPIToVovkSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
     const schema = {
         $schema: types_1.VovkSchemaIdEnum.SCHEMA,
         segments: {

package/mjs/openapi/openAPIToVovkSchema.d.ts

@@ -0,0 +1,15 @@
+import type { OpenAPIObject, OperationObject } from 'openapi3-ts/oas31';
+import { HttpMethod, type VovkSchema } from '../types';
+declare const defaultGetHandlerInfo: ({ method, path, operation, defaultModuleName, }: {
+    method: HttpMethod;
+    path: string;
+    operation: OperationObject;
+    openAPIObject: OpenAPIObject;
+    defaultModuleName: string;
+}) => [string, string];
+export declare function openAPIToVovkSchema({ openAPIObject, getHandlerInfo, defaultModuleName, }: {
+    openAPIObject: OpenAPIObject;
+    getHandlerInfo?: typeof defaultGetHandlerInfo;
+    defaultModuleName?: string;
+}): VovkSchema;
+export {};

package/mjs/openapi/openAPIToVovkSchema.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openAPIToVovkSchema = openAPIToVovkSchema;
+const types_1 = require("../types");
+const generateFnName_1 = require("./generateFnName");
+function applyComponents(schema, components) {
+    if (!components || !Object.keys(components).length)
+        return schema;
+    // Create a deep copy of the schema
+    const result = JSON.parse(JSON.stringify(schema));
+    // Initialize $defs if it doesn't exist
+    result.$defs = result.$defs || {};
+    // Set to track components we've added to $defs
+    const addedComponents = new Set();
+    // Process a schema object and replace $refs
+    function processSchema(obj) {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        // Create a new object/array to avoid modifying the input
+        const newObj = Array.isArray(obj) ? [...obj] : { ...obj };
+        // Check for $ref
+        if (newObj.$ref && typeof newObj.$ref === 'string' && newObj.$ref.startsWith('#/components/schemas/')) {
+            const componentName = newObj.$ref.replace('#/components/schemas/', '');
+            newObj.$ref = `#/$defs/${componentName}`;
+            // Add the component to $defs if not already added
+            if (!addedComponents.has(componentName) && components[componentName]) {
+                addedComponents.add(componentName);
+                result.$defs[componentName] = processSchema(JSON.parse(JSON.stringify(components[componentName])));
+            }
+        }
+        // Process properties/items recursively
+        if (Array.isArray(newObj)) {
+            for (let i = 0; i < newObj.length; i++) {
+                newObj[i] = processSchema(newObj[i]);
+            }
+        }
+        else {
+            for (const key in newObj) {
+                if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+                    newObj[key] = processSchema(newObj[key]);
+                }
+            }
+        }
+        return newObj;
+    }
+    // Process the main schema
+    return processSchema(result);
+}
+function snakeToCamel(str) {
+    return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+}
+const defaultGetHandlerInfo = ({ method, path, operation, defaultModuleName, }) => {
+    const operationId = operation.operationId?.replace(/[^a-zA-Z0-9_]/g, '_') ?? null;
+    const controllerHandlerMatch = operationId?.match(/^([A-Z][a-zA-Z0-9]*)_([a-zA-Z0-9_]+)/);
+    const isSnakeCase = operationId && /^[a-z][a-z0-9_]+$/.test(operationId);
+    const [controllerName, handlerName] = controllerHandlerMatch?.slice(1, 3) ?? [
+        defaultModuleName,
+        isSnakeCase
+            ? snakeToCamel(operationId)
+            : operationId?.match(/^[a-zA-Z][a-zA-Z0-9_]+$/)
+                ? operationId
+                : (0, generateFnName_1.generateFnName)(method, path),
+    ];
+    const rpcModuleName = controllerName.endsWith('Controller')
+        ? controllerName.replace(/Controller$/, 'RPC')
+        : controllerName;
+    return [rpcModuleName, handlerName];
+};
+function openAPIToVovkSchema({ openAPIObject, getHandlerInfo = defaultGetHandlerInfo, defaultModuleName = 'api', }) {
+    const schema = {
+        $schema: types_1.VovkSchemaIdEnum.SCHEMA,
+        segments: {
+            '': {
+                $schema: types_1.VovkSchemaIdEnum.SEGMENT,
+                emitSchema: true,
+                segmentName: '',
+                controllers: {},
+            },
+        },
+        meta: {
+            $schema: types_1.VovkSchemaIdEnum.META,
+            config: {
+                $schema: types_1.VovkSchemaIdEnum.CONFIG,
+            },
+            openapi: openAPIObject,
+        },
+    };
+    const segment = schema.segments[''];
+    return Object.entries(openAPIObject.paths ?? {}).reduce((acc, [path, operations]) => {
+        Object.entries(operations).forEach(([method, operation]) => {
+            const [rpcModuleName, handlerName] = getHandlerInfo({
+                method: method.toUpperCase(),
+                path,
+                operation,
+                openAPIObject,
+                defaultModuleName,
+            });
+            segment.controllers[rpcModuleName] ??= {
+                rpcModuleName,
+                handlers: {},
+            };
+            // TODO how to utilize ReferenceObject?
+            const queryProperties = operation.parameters?.filter((p) => p.in === 'query') || [];
+            const pathProperties = operation.parameters?.filter((p) => p.in === 'path') || [];
+            const query = Array.isArray(operation.parameters)
+                ? {
+                    type: 'object',
+                    properties: Object.fromEntries(queryProperties.map((p) => [p.name, p.schema])),
+                    required: queryProperties.filter((p) => p.required).map((p) => p.name),
+                }
+                : null;
+            const params = Array.isArray(pathProperties)
+                ? {
+                    type: 'object',
+                    properties: Object.fromEntries(pathProperties.map((p) => [p.name, p.schema])),
+                    required: pathProperties.filter((p) => p.required).map((p) => p.name),
+                }
+                : null;
+            // TODO how to utilize ReferenceObject?
+            const body = operation.requestBody?.content['application/json']?.schema ?? null;
+            const output = operation.responses?.['200']?.content?.['application/json']?.schema ??
+                operation.responses?.['201']?.content?.['application/json']?.schema ??
+                null;
+            segment.controllers[rpcModuleName].handlers[handlerName] = {
+                httpMethod: method.toUpperCase(),
+                path,
+                openapi: operation,
+                validation: {
+                    ...(query && { query: applyComponents(query, openAPIObject.components?.schemas) }),
+                    ...(params && { params: applyComponents(params, openAPIObject.components?.schemas) }),
+                    ...(body && { body: applyComponents(body, openAPIObject.components?.schemas) }),
+                    ...(output && { output: applyComponents(output, openAPIObject.components?.schemas) }),
+                },
+            };
+        });
+        return acc;
+    }, schema);
+}

package/mjs/openapi/schemaToOpenAPI.d.ts

@@ -1,7 +1,7 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 import { type CodeSamplePackageJson } from '../utils/createCodeExamples';
 import { type VovkSchema } from '../types';
-export declare function schemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
+export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
     rootEntry: string;
     schema: VovkSchema;
     openAPIObject?: Partial<OpenAPIObject>;

package/mjs/openapi/schemaToOpenAPI.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schemaToOpenAPI = schemaToOpenAPI;
+exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
 const json_schema_sampler_1 = require("@stoplight/json-schema-sampler");
 const createCodeExamples_1 = require("../utils/createCodeExamples");
 const types_1 = require("../types");
@@ -43,7 +43,7 @@ function extractComponents(schema) {
     const processedSchema = process(schema);
     return [processedSchema, components];
 }
-function schemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
     const paths = {};
     const components = {};
     for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments)) {

package/mjs/openapi/vovkSchemaToOpenAPI.d.ts

@@ -0,0 +1,9 @@
+import type { OpenAPIObject } from 'openapi3-ts/oas31';
+import { type CodeSamplePackageJson } from '../utils/createCodeExamples';
+import { type VovkSchema } from '../types';
+export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject, package: packageJson, }: {
+    rootEntry: string;
+    schema: VovkSchema;
+    openAPIObject?: Partial<OpenAPIObject>;
+    package?: CodeSamplePackageJson;
+}): OpenAPIObject;

package/mjs/openapi/vovkSchemaToOpenAPI.js

@@ -0,0 +1,237 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
+const json_schema_sampler_1 = require("@stoplight/json-schema-sampler");
+const createCodeExamples_1 = require("../utils/createCodeExamples");
+const types_1 = require("../types");
+function extractComponents(schema) {
+    if (!schema)
+        return [undefined, {}];
+    const components = {};
+    // Function to collect components and replace $refs recursively
+    const process = (obj, path = []) => {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        // Handle arrays
+        if (Array.isArray(obj)) {
+            return obj.map((item) => process(item, path));
+        }
+        // Create a copy to modify
+        const result = {};
+        Object.entries({ ...obj.definitions, ...obj.$defs }).forEach(([key, value]) => {
+            components[key] = process(value, [...path, key]);
+        });
+        // Process all properties
+        for (const [key, value] of Object.entries(obj)) {
+            // Skip already processed special properties
+            if (key === '$defs' || key === 'definitions')
+                continue;
+            if (key === '$ref' && typeof value === 'string') {
+                // Extract the component name from the reference
+                const refParts = value.split('/');
+                const refName = refParts[refParts.length - 1];
+                // Replace with component reference
+                result[key] = `#/components/schemas/${refName}`;
+            }
+            else {
+                // Recursively process other properties
+                result[key] = process(value, [...path, key]);
+            }
+        }
+        return result;
+    };
+    const processedSchema = process(schema);
+    return [processedSchema, components];
+}
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'vovk-client' }, }) {
+    const paths = {};
+    const components = {};
+    for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments)) {
+        for (const c of Object.values(segmentSchema.controllers)) {
+            for (const [handlerName, h] of Object.entries(c.handlers)) {
+                if (h.openapi) {
+                    const [queryValidation, queryComponents] = extractComponents(h?.validation?.query);
+                    const [bodyValidation, bodyComponents] = extractComponents(h?.validation?.body);
+                    const [paramsValidation, paramsComponents] = extractComponents(h?.validation?.params);
+                    const [outputValidation, outputComponents] = extractComponents(h?.validation?.output);
+                    const [iterationValidation, iterationComponents] = extractComponents(h?.validation?.iteration);
+                    // TODO: Handle name conflicts?
+                    Object.assign(components, queryComponents, bodyComponents, paramsComponents, outputComponents, iterationComponents);
+                    const { ts, rs, py } = (0, createCodeExamples_1.createCodeExamples)({
+                        package: packageJson,
+                        handlerName,
+                        handlerSchema: h,
+                        controllerSchema: c,
+                    });
+                    const queryParameters = queryValidation && 'type' in queryValidation && 'properties' in queryValidation
+                        ? Object.entries(queryValidation.properties).map(([propName, propSchema]) => ({
+                            name: propName,
+                            in: 'query',
+                            required: queryValidation.required ? queryValidation.required.includes(propName) : false,
+                            schema: propSchema,
+                        }))
+                        : null;
+                    const pathParameters = paramsValidation && 'type' in paramsValidation && 'properties' in paramsValidation
+                        ? Object.entries(paramsValidation.properties).map(([propName, propSchema]) => ({
+                            name: propName,
+                            in: 'path',
+                            required: paramsValidation.required ? paramsValidation.required.includes(propName) : false,
+                            schema: propSchema,
+                        }))
+                        : null;
+                    const path = '/' +
+                        [rootEntry.replace(/^\/+|\/+$/g, ''), segmentName, c.prefix, h.path]
+                            .filter(Boolean)
+                            .join('/')
+                            .replace(/:([a-zA-Z0-9_]+)/g, '{$1}');
+                    paths[path] = paths[path] ?? {};
+                    const httpMethod = h.httpMethod.toLowerCase();
+                    paths[path][httpMethod] ??= {};
+                    paths[path][httpMethod] = {
+                        ...h.openapi,
+                        ...paths[path][httpMethod],
+                        'x-codeSamples': [
+                            ...(paths[path][httpMethod]['x-codeSamples'] ?? []),
+                            ...(h.openapi['x-codeSamples'] ?? []),
+                            {
+                                label: 'TypeScript RPC',
+                                lang: 'typescript',
+                                source: ts,
+                            },
+                            {
+                                label: 'Python RPC',
+                                lang: 'python',
+                                source: py,
+                            },
+                            {
+                                label: 'Rust RPC',
+                                lang: 'rust',
+                                source: rs,
+                            },
+                        ],
+                        ...(queryParameters || pathParameters
+                            ? {
+                                parameters: h.openapi.parameters ?? [...(queryParameters || []), ...(pathParameters || [])],
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].parameters
+                            ? {
+                                parameters: paths[path][httpMethod].parameters,
+                            }
+                            : {}),
+                        ...(outputValidation && 'type' in outputValidation && 'properties' in outputValidation
+                            ? {
+                                responses: {
+                                    200: {
+                                        description: 'description' in outputValidation ? outputValidation.description : 'Success',
+                                        content: {
+                                            'application/json': {
+                                                schema: outputValidation,
+                                            },
+                                        },
+                                    },
+                                    ...h.openapi?.responses,
+                                },
+                            }
+                            : {}),
+                        ...(iterationValidation && 'type' in iterationValidation && 'properties' in iterationValidation
+                            ? {
+                                responses: {
+                                    200: {
+                                        description: 'description' in iterationValidation ? iterationValidation.description : 'JSON Lines response',
+                                        content: {
+                                            'application/jsonl': {
+                                                schema: {
+                                                    ...iterationValidation,
+                                                    examples: iterationValidation.examples ?? [
+                                                        [
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                            JSON.stringify((0, json_schema_sampler_1.sample)(iterationValidation)),
+                                                        ].join('\n'),
+                                                    ],
+                                                },
+                                            },
+                                        },
+                                    },
+                                    ...h.openapi?.responses,
+                                },
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].responses
+                            ? {
+                                responses: paths[path][httpMethod].responses,
+                            }
+                            : {}),
+                        ...(bodyValidation && 'type' in bodyValidation && 'properties' in bodyValidation
+                            ? {
+                                requestBody: h.openapi?.requestBody ?? {
+                                    description: 'description' in bodyValidation ? bodyValidation.description : 'Request body',
+                                    required: true,
+                                    content: {
+                                        'application/json': {
+                                            schema: bodyValidation,
+                                        },
+                                    },
+                                },
+                            }
+                            : {}),
+                        ...(paths[path][httpMethod].requestBody
+                            ? {
+                                requestBody: paths[path][httpMethod].requestBody,
+                            }
+                            : {}),
+                        tags: paths[path][httpMethod].tags ?? h.openapi?.tags,
+                    };
+                }
+            }
+        }
+    }
+    return {
+        ...openAPIObject,
+        openapi: '3.1.0',
+        info: {
+            title: packageJson?.description ?? 'API',
+            version: packageJson?.version ?? '0.0.1',
+            ...openAPIObject?.info,
+        },
+        components: {
+            schemas: {
+                ...(openAPIObject?.components?.schemas ?? components),
+                HttpStatus: {
+                    type: 'integer',
+                    description: 'HTTP status code',
+                    enum: Object.keys(types_1.HttpStatus)
+                        .map((k) => types_1.HttpStatus[k])
+                        .filter(Boolean)
+                        .filter((v) => typeof v === 'number'),
+                },
+                VovkErrorResponse: {
+                    type: 'object',
+                    description: 'Vovk error response',
+                    properties: {
+                        cause: {
+                            description: 'Error cause of any shape',
+                        },
+                        statusCode: {
+                            $ref: '#/components/schemas/HttpStatus',
+                        },
+                        message: {
+                            type: 'string',
+                            description: 'Error message',
+                        },
+                        isError: {
+                            type: 'boolean',
+                            const: true,
+                            description: 'Indicates that this object represents an error',
+                        },
+                    },
+                    required: ['statusCode', 'message', 'isError'],
+                    additionalProperties: false,
+                },
+                ...openAPIObject?.components?.schemas,
+            },
+        },
+        paths,
+    };
+}

package/mjs/types.d.ts

@@ -96,6 +96,16 @@ export type ControllerStaticMethod<REQ extends VovkRequest<KnownAny, KnownAny> =
 } = KnownAny> = ((req: REQ, params: PARAMS) => unknown) & {
     _controller?: VovkController;
 };
+export type VovkTypedMethod<T extends (...args: KnownAny[]) => KnownAny, B = KnownAny, Q = KnownAny, P = KnownAny, O = KnownAny, I = KnownAny> = T & {
+    __types: {
+        body?: B;
+        query?: Q;
+        params?: P;
+        output?: O;
+        iteration?: I;
+    };
+    isRPC?: boolean;
+};
 export type VovkControllerBody<T extends (...args: KnownAny) => KnownAny> = Awaited<ReturnType<Parameters<T>[0]['vovk']['body']>>;
 export type VovkControllerQuery<T extends (...args: KnownAny) => KnownAny> = ReturnType<Parameters<T>[0]['vovk']['query']>;
 export type VovkControllerParams<T extends (...args: KnownAny) => KnownAny> = Parameters<T>[1] extends object ? Parameters<T>[1] : ReturnType<Parameters<T>[0]['vovk']['params']>;

package/mjs/utils/withValidation.d.ts

@@ -1,14 +1,6 @@
-import { VovkHandlerSchema, VovkValidationType, type KnownAny, type VovkRequest } from '../types.js';
+import { VovkHandlerSchema, VovkTypedMethod, VovkValidationType, type KnownAny, type VovkRequest } from '../types.js';
 type VovkRequestAny = VovkRequest<KnownAny, KnownAny, KnownAny>;
-export declare function withValidation<T extends ((req: KnownAny, params: KnownAny) => KnownAny) & {
-    __types: {
-        body: KnownAny;
-        query: KnownAny;
-        params: KnownAny;
-        output: KnownAny;
-        iteration: KnownAny;
-    };
-}, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }: {
+export declare function withValidation<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }: {
     disableServerSideValidation?: boolean | VovkValidationType[];
     skipSchemaEmission?: boolean | VovkValidationType[];
     validateEachIteration?: boolean;

package/package.json

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