vovk 3.0.0-draft.323 → 3.0.0-draft.324

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

@@ -1,4 +1,4 @@
 import { type VovkSchema, VovkStrictConfig } from '../../types';
-export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, mixinName, }: VovkStrictConfig['openApiMixins'][string] & {
+export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, mixinName, }: VovkStrictConfig['openApiMixins'][string] & {
     mixinName: string;
 }): VovkSchema;

package/cjs/openapi/openAPIToVovkSchema/index.js

@@ -57,7 +57,7 @@ const normalizeGetMethodName = (getMethodName) => {
     }
     return getMethodName;
 };
-function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName = 'api', getMethodName = 'auto', errorMessageKey, mixinName, }) {
+function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName = 'api', getMethodName = 'auto', errorMessageKey, package: packageJson, mixinName, }) {
     const forceApiRoot = apiRoot ??
         openAPIObject.servers?.[0]?.url ??
         ('host' in openAPIObject
@@ -77,6 +77,7 @@ function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getMo
                 controllers: {},
                 meta: {
                     components: openAPIObject.components,
+                    package: packageJson,
                 },
             },
         },

package/cjs/openapi/vovkSchemaToOpenAPI.d.ts

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

package/cjs/openapi/vovkSchemaToOpenAPI.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
 const createCodeExamples_1 = require("../utils/createCodeExamples");
-const jsonSchemaSampler_1 = require("../utils/jsonSchemaSampler");
 const types_1 = require("../types");
+const getJSONSchemaSample_1 = require("../utils/getJSONSchemaSample");
 function extractComponents(schema) {
     if (!schema)
         return [undefined, {}];
@@ -43,7 +43,7 @@ function extractComponents(schema) {
     const processedSchema = process(schema);
     return [processedSchema, components];
 }
-function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'my-rpc-client' }, sampler = jsonSchemaSampler_1.jsonSchemaSampler, }) {
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'my-rpc-client' }, }) {
     const paths = {};
     const components = {};
     for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments ?? {})) {
@@ -141,9 +141,9 @@ function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}
                                                     ...iterationValidation,
                                                     examples: iterationValidation.examples ?? [
                                                         [
-                                                            JSON.stringify(sampler(iterationValidation)),
-                                                            JSON.stringify(sampler(iterationValidation)),
-                                                            JSON.stringify(sampler(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
                                                         ].join('\n'),
                                                     ],
                                                 },

package/cjs/types.d.ts

@@ -34,6 +34,7 @@ export type VovkSegmentSchema<T = KnownAny> = {
     controllers: Record<string, VovkControllerSchema<T>>;
     meta?: {
         components?: OpenAPIObject['components'];
+        package?: PackageJson;
         [key: string]: KnownAny;
     };
 };
@@ -241,6 +242,7 @@ export interface VovkLLMTool {
 export type SimpleJSONSchema = {
     type: 'object';
     $ref?: string;
+    items?: SimpleJSONSchema;
     description?: string;
     properties: Record<string, SimpleJSONSchema>;
     required?: string[];

package/cjs/utils/createCodeExamples.d.ts

@@ -7,12 +7,11 @@ export type CodeSamplePackageJson = {
     py_name?: string;
     [key: string]: KnownAny;
 };
-export declare function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, sampler, }: {
+export declare function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, }: {
     handlerName: string;
     handlerSchema: VovkHandlerSchema;
     controllerSchema: VovkControllerSchema;
     package?: CodeSamplePackageJson;
-    sampler?: (schema: KnownAny) => KnownAny;
 }): {
     ts: string;
     py: string;

package/cjs/utils/createCodeExamples.js

@@ -1,34 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodeExamples = createCodeExamples;
-const jsonSchemaSampler_1 = require("./jsonSchemaSampler");
-const stringifyTsSample = (data, pad = 4) => JSON.stringify(data, null, 2)
-    .replace(/"([A-Za-z_$][0-9A-Za-z_$]*)":/g, '$1:')
-    .split('\n')
-    .map((line, i, a) => (i === 0 ? line : i === a.length - 1 ? ' '.repeat(pad) + line : ' '.repeat(pad + 2) + line))
-    .join('\n');
-const stringifyPySample = (data, pad = 4) => JSON.stringify(data, null, 2)
-    .split('\n')
-    .map((line, i, a) => (i === 0 ? line : i === a.length - 1 ? ' '.repeat(pad) + line : ' '.repeat(pad + 2) + line))
-    .join('\n');
+const getJSONSchemaExample_1 = require("./getJSONSchemaExample");
 const toSnakeCase = (str) => str
     .replace(/-/g, '_') // Replace hyphens with underscores
     .replace(/([a-z0-9])([A-Z])/g, '$1_$2') // Add underscore between lowercase/digit and uppercase
     .replace(/([A-Z])([A-Z])(?=[a-z])/g, '$1_$2') // Add underscore between uppercase letters if the second one is followed by a lowercase
     .toLowerCase()
     .replace(/^_/, ''); // Remove leading underscore
-function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, sampler = jsonSchemaSampler_1.jsonSchemaSampler, }) {
+function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, }) {
     const queryValidation = handlerSchema?.validation?.query;
     const bodyValidation = handlerSchema?.validation?.body;
     const paramsValidation = handlerSchema?.validation?.params;
     const outputValidation = handlerSchema?.validation?.output;
     const iterationValidation = handlerSchema?.validation?.iteration;
-    const queryFake = queryValidation && sampler(queryValidation);
-    const bodyFake = bodyValidation && sampler(bodyValidation);
-    const paramsFake = paramsValidation && sampler(paramsValidation);
-    const outputFake = outputValidation && sampler(outputValidation);
-    const iterationFake = iterationValidation && sampler(iterationValidation);
-    const hasArg = !!queryFake || !!bodyFake || !!paramsFake;
+    const getTsSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: true, indent: indent ?? 4 });
+    const getPySample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4, comment: '#' });
+    const getRsSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4 });
+    const hasArg = !!queryValidation || !!bodyValidation || !!paramsValidation;
     const rpcName = controllerSchema.rpcModuleName;
     const handlerNameSnake = toSnakeCase(handlerName);
     const rpcNameSnake = toSnakeCase(rpcName);
@@ -36,43 +25,50 @@ function createCodeExamples({ handlerName, handlerSchema, controllerSchema, pack
     const packageNameSnake = toSnakeCase(packageName);
     const tsArgs = hasArg
         ? `{
-${paramsFake ? `    params: ${stringifyTsSample(paramsFake)},\n` : ''}${bodyFake ? `    body: ${stringifyTsSample(bodyFake)},\n` : ''}${queryFake ? `    query: ${stringifyTsSample(queryFake)},\n` : ''}}`
+${[
+            bodyValidation ? `    body: ${getTsSample(bodyValidation)},` : null,
+            queryValidation ? `    query: ${getTsSample(queryValidation)},` : null,
+            paramsValidation ? `    params: ${getTsSample(paramsValidation)},` : null,
+        ]
+            .filter(Boolean)
+            .join('\n')}
+}`
         : '';
     const TS_CODE = `import { ${rpcName} } from '${packageName}';
 
-${iterationFake ? 'using' : 'const'} response = await ${rpcName}.${handlerName}(${tsArgs});
-${outputFake
+${iterationValidation ? 'using' : 'const'} response = await ${rpcName}.${handlerName}(${tsArgs});
+${outputValidation
         ? `
 console.log(response); 
 /* 
-${stringifyTsSample(outputFake, 0)}
+${getTsSample(outputValidation, 0)}
 */`
-        : ''}${iterationFake
+        : ''}${iterationValidation
         ? `
 for await (const item of response) {
     console.log(item); 
     /*
-    ${stringifyTsSample(iterationFake, 4)}
+    ${getTsSample(iterationValidation, 2)}
     */
 }`
         : ''}`;
     const PY_CODE = `from ${packageJson?.py_name ?? packageNameSnake} import ${rpcName}
 
-response = ${rpcName}.${handlerNameSnake}(${hasArg ? `\n    params=${paramsFake ? stringifyPySample(paramsFake) : 'None'},\n` : ''}${bodyFake ? `    body=${stringifyPySample(bodyFake)},\n` : ''}${queryFake ? `    query=${stringifyPySample(queryFake)},\n` : ''})
+response = ${rpcName}.${handlerNameSnake}(${hasArg
+        ? [
+            bodyValidation ? `    body=${getPySample(bodyValidation)},` : null,
+            queryValidation ? `    query=${getPySample(queryValidation)},` : null,
+            paramsValidation ? `    params=${getPySample(paramsValidation)},` : null,
+        ]
+            .filter(Boolean)
+            .join('\n')
+        : ''})
 
-${outputFake
-        ? `print(response)\n${JSON.stringify(outputFake, null, 2)
-            .split('\n')
-            .map((s) => `# ${s}`)
-            .join('\n')}`
-        : ''}${iterationFake
+${outputValidation ? `print(response)\n${getPySample(outputValidation, 0)}` : ''}${iterationValidation
         ? `for i, item in enumerate(response):
-    print(f"iteration #{i}:\\n {item}") 
-    # iteration #0: 
-${JSON.stringify(iterationFake, null, 2)
-            .split('\n')
-            .map((s) => `    # ${s}`)
-            .join('\n')}`
+    print(f"iteration #{i}:\\n {item}")
+    # iteration #0:
+${getPySample(iterationValidation, 2)}`
         : ''}`;
     const serdeUnwrap = (fake) => `from_value(json!(${fake})).unwrap()`;
     const RS_CODE = `use ${packageJson?.rs_name ?? packageNameSnake}::${rpcNameSnake};
@@ -80,29 +76,29 @@ use serde_json::{ from_value, json };
 
 pub fn main() {
   let response = ${rpcNameSnake}::${handlerNameSnake}(
-    ${bodyFake ? serdeUnwrap(stringifyPySample(bodyFake)) : '()'}, /* body */ 
-    ${queryFake ? serdeUnwrap(stringifyPySample(queryFake)) : '()'}, /* query */ 
-    ${paramsFake ? serdeUnwrap(stringifyPySample(paramsFake)) : '()'}, /* params */ 
+    ${bodyValidation ? serdeUnwrap(getRsSample(bodyValidation)) : '()'}, /* body */ 
+    ${queryValidation ? serdeUnwrap(getRsSample(queryValidation)) : '()'}, /* query */ 
+    ${paramsValidation ? serdeUnwrap(getRsSample(paramsValidation)) : '()'}, /* params */ 
     None, /* headers (HashMap) */ 
     None, /* api_root */ 
     false, /* disable_client_validation */
   );
 
-  ${outputFake
+  ${outputValidation
         ? `match response {
     Ok(output) => println!("{:?}", output),
     /* 
-    output ${stringifyPySample(outputFake, 4)} 
+    output ${getTsSample(outputValidation, 2)} 
     */
     Err(e) => println!("error: {:?}", e),
   }`
-        : ''}${iterationFake
+        : ''}${iterationValidation
         ? `match response {
       Ok(stream) => {
         for (i, item) in stream.enumerate() {
           println!("#{}: {:?}", i, item);
           /*
-          #0: iteration ${stringifyTsSample(iterationFake, 10)}
+          #0: iteration ${getTsSample(iterationValidation, 6)}
           */
         }
       },

package/cjs/utils/getJSONSchemaExample.d.ts

@@ -0,0 +1,8 @@
+import { KnownAny } from '../types';
+interface SamplerOptions {
+    comment?: '//' | '#';
+    stripQuotes?: boolean;
+    indent?: number;
+}
+export declare function getJSONSchemaExample(schema: KnownAny, options: SamplerOptions, rootSchema?: KnownAny): string;
+export {};

package/cjs/utils/getJSONSchemaExample.js

@@ -0,0 +1,234 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJSONSchemaExample = getJSONSchemaExample;
+function getJSONSchemaExample(schema, options, rootSchema) {
+    const { comment = '//', stripQuotes = false, indent = 0 } = options;
+    if (!schema || typeof schema !== 'object')
+        return 'null';
+    // Use the input schema as the root if not provided
+    rootSchema = rootSchema || schema;
+    // Get the sample value
+    const sampleValue = getSampleValue(schema, rootSchema);
+    // Format the output with descriptions
+    return formatWithDescriptions(sampleValue, schema, rootSchema, comment, stripQuotes, indent);
+}
+function getSampleValue(schema, rootSchema) {
+    if (!schema || typeof schema !== 'object')
+        return null;
+    // If there's an example, use it
+    if (schema.example !== undefined) {
+        return schema.example;
+    }
+    // If there are examples, use one of them
+    if (schema.examples && schema.examples.length > 0) {
+        return schema.examples[0];
+    }
+    // Handle const if present
+    if (schema.const !== undefined) {
+        return schema.const;
+    }
+    // Handle $ref if present
+    if (schema.$ref) {
+        return handleRef(schema.$ref, rootSchema);
+    }
+    // Handle enum if present
+    if (schema.enum && schema.enum.length > 0) {
+        return schema.enum[0];
+    }
+    // Handle oneOf, anyOf, allOf
+    if (schema.oneOf && schema.oneOf.length > 0) {
+        return getSampleValue(schema.oneOf[0], rootSchema);
+    }
+    if (schema.anyOf && schema.anyOf.length > 0) {
+        return getSampleValue(schema.anyOf[0], rootSchema);
+    }
+    if (schema.allOf && schema.allOf.length > 0) {
+        // Merge all schemas in allOf
+        const mergedSchema = schema.allOf.reduce((acc, s) => ({ ...acc, ...s }), {});
+        return getSampleValue(mergedSchema, rootSchema);
+    }
+    // Handle different types
+    if (schema.type) {
+        switch (schema.type) {
+            case 'string':
+                return handleString(schema);
+            case 'number':
+            case 'integer':
+                return handleNumber(schema);
+            case 'boolean':
+                return handleBoolean();
+            case 'object':
+                return handleObject(schema, rootSchema);
+            case 'array':
+                return handleArray(schema, rootSchema);
+            case 'null':
+                return null;
+            default:
+                return null;
+        }
+    }
+    // If type is not specified but properties are, treat it as an object
+    if (schema.properties) {
+        return handleObject(schema, rootSchema);
+    }
+    // Default fallback
+    return null;
+}
+function formatWithDescriptions(value, schema, rootSchema, comment, stripQuotes, indent) {
+    const indentStr = '  '.repeat(indent);
+    // Handle null
+    if (value === null) {
+        return 'null';
+    }
+    // Handle primitives
+    if (typeof value !== 'object' || value instanceof Date) {
+        return JSON.stringify(value);
+    }
+    // Handle arrays
+    if (Array.isArray(value)) {
+        if (value.length === 0)
+            return '[]';
+        const items = value.map((item) => {
+            const itemSchema = schema.items || {};
+            const formattedItem = formatWithDescriptions(item, itemSchema, rootSchema, comment, stripQuotes, indent + 1);
+            return `${indentStr}  ${formattedItem}`;
+        });
+        return `[\n${items.join(',\n')}\n${indentStr}]`;
+    }
+    // Handle objects
+    if (typeof value === 'object') {
+        const entries = Object.entries(value);
+        if (entries.length === 0)
+            return '{}';
+        const formattedEntries = [];
+        const isTopLevel = indent === 0;
+        // Add top-level description for objects
+        if (isTopLevel && schema.type === 'object' && schema.description) {
+            const descLines = schema.description.split('\n');
+            formattedEntries.push(`${indentStr}${comment} -----`);
+            descLines.forEach((line) => {
+                formattedEntries.push(`${indentStr}${comment} ${line.trim()}`);
+            });
+            formattedEntries.push(`${indentStr}${comment} -----`);
+        }
+        entries.forEach(([key, val], index) => {
+            const propSchema = schema.properties?.[key] || {};
+            // Handle $ref in property schema
+            let resolvedPropSchema = propSchema;
+            if (propSchema.$ref) {
+                resolvedPropSchema = resolveRef(propSchema.$ref, rootSchema);
+            }
+            // Add property description if it exists
+            if (resolvedPropSchema.description) {
+                const descLines = resolvedPropSchema.description.split('\n');
+                descLines.forEach((line) => {
+                    formattedEntries.push(`${indentStr}  ${comment} ${line.trim()}`);
+                });
+            }
+            // Format the key
+            const formattedKey = stripQuotes && /^[A-Za-z_$][0-9A-Za-z_$]*$/.test(key) ? key : JSON.stringify(key);
+            // Format the value
+            const formattedValue = formatWithDescriptions(val, resolvedPropSchema, rootSchema, comment, stripQuotes, indent + 1);
+            formattedEntries.push(`${indentStr}  ${formattedKey}: ${formattedValue}${index < entries.length - 1 ? ',' : ''}`);
+        });
+        return `{\n${formattedEntries.join('\n')}\n${indentStr}}`;
+    }
+    return JSON.stringify(value);
+}
+function resolveRef(ref, rootSchema) {
+    const path = ref.split('/').slice(1);
+    let current = rootSchema;
+    for (const segment of path) {
+        current = current[segment];
+        if (current === undefined) {
+            return {};
+        }
+    }
+    return current;
+}
+function handleRef(ref, rootSchema) {
+    const resolved = resolveRef(ref, rootSchema);
+    return getSampleValue(resolved, rootSchema);
+}
+function handleString(schema) {
+    if (schema.format) {
+        switch (schema.format) {
+            case 'email':
+            case 'idn-email':
+                return 'user@example.com';
+            case 'uri':
+            case 'url':
+            case 'iri':
+                return 'https://example.com';
+            case 'date':
+                return '2023-01-01';
+            case 'date-time':
+                return '2023-01-01T00:00:00Z';
+            case 'time':
+                return '12:00:00Z';
+            case 'duration':
+                return 'PT1H';
+            case 'uuid':
+                return '00000000-0000-0000-0000-000000000000';
+            case 'regex':
+                return '^[a-zA-Z0-9]+$';
+            case 'relative-json-pointer':
+                return '/some/relative/path';
+            case 'color':
+                return '#000000';
+            case 'hostname':
+                return 'example.com';
+            case 'zipcode':
+                return '12345';
+            case 'phone':
+                return '+123-456-7890';
+            case 'password':
+                return '******';
+            default:
+                return 'string';
+        }
+    }
+    if (schema.pattern) {
+        return 'pattern-string';
+    }
+    return 'string';
+}
+function handleNumber(schema) {
+    if (schema.minimum !== undefined && schema.maximum !== undefined) {
+        return schema.minimum;
+    }
+    else if (schema.minimum !== undefined) {
+        return schema.minimum;
+    }
+    else if (schema.maximum !== undefined) {
+        return schema.maximum;
+    }
+    return 0;
+}
+function handleBoolean() {
+    return true;
+}
+function handleObject(schema, rootSchema) {
+    const result = {};
+    if (schema.properties) {
+        const required = schema.required || [];
+        for (const [key, propSchema] of Object.entries(schema.properties)) {
+            if (required.includes(key) || required.length === 0) {
+                result[key] = getSampleValue(propSchema, rootSchema);
+            }
+        }
+    }
+    if (schema.additionalProperties && typeof schema.additionalProperties === 'object') {
+        result['additionalProp'] = getSampleValue(schema.additionalProperties, rootSchema);
+    }
+    return result;
+}
+function handleArray(schema, rootSchema) {
+    if (schema.items) {
+        const itemSchema = schema.items;
+        const minItems = schema.minItems || 1;
+        const numItems = Math.min(minItems, 3);
+        return Array.from({ length: numItems }, () => getSampleValue(itemSchema, rootSchema));
+    }
+    return [];
+}

package/cjs/utils/getJSONSchemaSample.d.ts

@@ -0,0 +1,2 @@
+import { KnownAny } from '../types';
+export declare function getJSONSchemaSample(schema: KnownAny, rootSchema?: KnownAny): KnownAny;

package/cjs/utils/{jsonSchemaSampler.js → getJSONSchemaSample.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaSampler = jsonSchemaSampler;
-function jsonSchemaSampler(schema, rootSchema) {
+exports.getJSONSchemaSample = getJSONSchemaSample;
+function getJSONSchemaSample(schema, rootSchema) {
     if (!schema || typeof schema !== 'object')
         return null;
     // Use the input schema as the root if not provided
@@ -28,15 +28,15 @@ function jsonSchemaSampler(schema, rootSchema) {
     }
     // Handle oneOf, anyOf, allOf
     if (schema.oneOf && schema.oneOf.length > 0) {
-        return jsonSchemaSampler(schema.oneOf[0], rootSchema);
+        return getJSONSchemaSample(schema.oneOf[0], rootSchema);
     }
     if (schema.anyOf && schema.anyOf.length > 0) {
-        return jsonSchemaSampler(schema.anyOf[0], rootSchema);
+        return getJSONSchemaSample(schema.anyOf[0], rootSchema);
     }
     if (schema.allOf && schema.allOf.length > 0) {
         // Merge all schemas in allOf
         const mergedSchema = schema.allOf.reduce((acc, s) => ({ ...acc, ...s }), {});
-        return jsonSchemaSampler(mergedSchema, rootSchema);
+        return getJSONSchemaSample(mergedSchema, rootSchema);
     }
     // Handle different types
     if (schema.type) {
@@ -77,7 +77,7 @@ function handleRef(ref, rootSchema) {
         }
     }
     // Process the referenced schema
-    return jsonSchemaSampler(current, rootSchema);
+    return getJSONSchemaSample(current, rootSchema);
 }
 function handleString(schema) {
     if (schema.format) {
@@ -145,13 +145,13 @@ function handleObject(schema, rootSchema) {
         for (const [key, propSchema] of Object.entries(schema.properties)) {
             // Only include required properties or as a basic example
             if (required.includes(key) || required.length === 0) {
-                result[key] = jsonSchemaSampler(propSchema, rootSchema);
+                result[key] = getJSONSchemaSample(propSchema, rootSchema);
             }
         }
     }
     // Handle additionalProperties
     if (schema.additionalProperties && typeof schema.additionalProperties === 'object') {
-        result['additionalProp'] = jsonSchemaSampler(schema.additionalProperties, rootSchema);
+        result['additionalProp'] = getJSONSchemaSample(schema.additionalProperties, rootSchema);
     }
     return result;
 }
@@ -161,7 +161,7 @@ function handleArray(schema, rootSchema) {
         const minItems = schema.minItems || 1;
         // Create minimum number of items (capped at a reasonable max for examples)
         const numItems = Math.min(minItems, 3);
-        return Array.from({ length: numItems }, () => jsonSchemaSampler(itemSchema, rootSchema));
+        return Array.from({ length: numItems }, () => getJSONSchemaSample(itemSchema, rootSchema));
     }
     return [];
 }

package/mjs/openapi/openAPIToVovkSchema/index.d.ts

@@ -1,4 +1,4 @@
 import { type VovkSchema, VovkStrictConfig } from '../../types';
-export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, mixinName, }: VovkStrictConfig['openApiMixins'][string] & {
+export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, mixinName, }: VovkStrictConfig['openApiMixins'][string] & {
     mixinName: string;
 }): VovkSchema;

package/mjs/openapi/openAPIToVovkSchema/index.js

@@ -57,7 +57,7 @@ const normalizeGetMethodName = (getMethodName) => {
     }
     return getMethodName;
 };
-function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName = 'api', getMethodName = 'auto', errorMessageKey, mixinName, }) {
+function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName = 'api', getMethodName = 'auto', errorMessageKey, package: packageJson, mixinName, }) {
     const forceApiRoot = apiRoot ??
         openAPIObject.servers?.[0]?.url ??
         ('host' in openAPIObject
@@ -77,6 +77,7 @@ function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getMo
                 controllers: {},
                 meta: {
                     components: openAPIObject.components,
+                    package: packageJson,
                 },
             },
         },

package/mjs/openapi/vovkSchemaToOpenAPI.d.ts

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

package/mjs/openapi/vovkSchemaToOpenAPI.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vovkSchemaToOpenAPI = vovkSchemaToOpenAPI;
 const createCodeExamples_1 = require("../utils/createCodeExamples");
-const jsonSchemaSampler_1 = require("../utils/jsonSchemaSampler");
 const types_1 = require("../types");
+const getJSONSchemaSample_1 = require("../utils/getJSONSchemaSample");
 function extractComponents(schema) {
     if (!schema)
         return [undefined, {}];
@@ -43,7 +43,7 @@ function extractComponents(schema) {
     const processedSchema = process(schema);
     return [processedSchema, components];
 }
-function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'my-rpc-client' }, sampler = jsonSchemaSampler_1.jsonSchemaSampler, }) {
+function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}, package: packageJson = { name: 'my-rpc-client' }, }) {
     const paths = {};
     const components = {};
     for (const [segmentName, segmentSchema] of Object.entries(fullSchema.segments ?? {})) {
@@ -141,9 +141,9 @@ function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, openAPIObject = {}
                                                     ...iterationValidation,
                                                     examples: iterationValidation.examples ?? [
                                                         [
-                                                            JSON.stringify(sampler(iterationValidation)),
-                                                            JSON.stringify(sampler(iterationValidation)),
-                                                            JSON.stringify(sampler(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
+                                                            JSON.stringify((0, getJSONSchemaSample_1.getJSONSchemaSample)(iterationValidation)),
                                                         ].join('\n'),
                                                     ],
                                                 },

package/mjs/types.d.ts

@@ -34,6 +34,7 @@ export type VovkSegmentSchema<T = KnownAny> = {
     controllers: Record<string, VovkControllerSchema<T>>;
     meta?: {
         components?: OpenAPIObject['components'];
+        package?: PackageJson;
         [key: string]: KnownAny;
     };
 };
@@ -241,6 +242,7 @@ export interface VovkLLMTool {
 export type SimpleJSONSchema = {
     type: 'object';
     $ref?: string;
+    items?: SimpleJSONSchema;
     description?: string;
     properties: Record<string, SimpleJSONSchema>;
     required?: string[];

package/mjs/utils/createCodeExamples.d.ts

@@ -7,12 +7,11 @@ export type CodeSamplePackageJson = {
     py_name?: string;
     [key: string]: KnownAny;
 };
-export declare function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, sampler, }: {
+export declare function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, }: {
     handlerName: string;
     handlerSchema: VovkHandlerSchema;
     controllerSchema: VovkControllerSchema;
     package?: CodeSamplePackageJson;
-    sampler?: (schema: KnownAny) => KnownAny;
 }): {
     ts: string;
     py: string;

package/mjs/utils/createCodeExamples.js

@@ -1,34 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodeExamples = createCodeExamples;
-const jsonSchemaSampler_1 = require("./jsonSchemaSampler");
-const stringifyTsSample = (data, pad = 4) => JSON.stringify(data, null, 2)
-    .replace(/"([A-Za-z_$][0-9A-Za-z_$]*)":/g, '$1:')
-    .split('\n')
-    .map((line, i, a) => (i === 0 ? line : i === a.length - 1 ? ' '.repeat(pad) + line : ' '.repeat(pad + 2) + line))
-    .join('\n');
-const stringifyPySample = (data, pad = 4) => JSON.stringify(data, null, 2)
-    .split('\n')
-    .map((line, i, a) => (i === 0 ? line : i === a.length - 1 ? ' '.repeat(pad) + line : ' '.repeat(pad + 2) + line))
-    .join('\n');
+const getJSONSchemaExample_1 = require("./getJSONSchemaExample");
 const toSnakeCase = (str) => str
     .replace(/-/g, '_') // Replace hyphens with underscores
     .replace(/([a-z0-9])([A-Z])/g, '$1_$2') // Add underscore between lowercase/digit and uppercase
     .replace(/([A-Z])([A-Z])(?=[a-z])/g, '$1_$2') // Add underscore between uppercase letters if the second one is followed by a lowercase
     .toLowerCase()
     .replace(/^_/, ''); // Remove leading underscore
-function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, sampler = jsonSchemaSampler_1.jsonSchemaSampler, }) {
+function createCodeExamples({ handlerName, handlerSchema, controllerSchema, package: packageJson, }) {
     const queryValidation = handlerSchema?.validation?.query;
     const bodyValidation = handlerSchema?.validation?.body;
     const paramsValidation = handlerSchema?.validation?.params;
     const outputValidation = handlerSchema?.validation?.output;
     const iterationValidation = handlerSchema?.validation?.iteration;
-    const queryFake = queryValidation && sampler(queryValidation);
-    const bodyFake = bodyValidation && sampler(bodyValidation);
-    const paramsFake = paramsValidation && sampler(paramsValidation);
-    const outputFake = outputValidation && sampler(outputValidation);
-    const iterationFake = iterationValidation && sampler(iterationValidation);
-    const hasArg = !!queryFake || !!bodyFake || !!paramsFake;
+    const getTsSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: true, indent: indent ?? 4 });
+    const getPySample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4, comment: '#' });
+    const getRsSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4 });
+    const hasArg = !!queryValidation || !!bodyValidation || !!paramsValidation;
     const rpcName = controllerSchema.rpcModuleName;
     const handlerNameSnake = toSnakeCase(handlerName);
     const rpcNameSnake = toSnakeCase(rpcName);
@@ -36,43 +25,50 @@ function createCodeExamples({ handlerName, handlerSchema, controllerSchema, pack
     const packageNameSnake = toSnakeCase(packageName);
     const tsArgs = hasArg
         ? `{
-${paramsFake ? `    params: ${stringifyTsSample(paramsFake)},\n` : ''}${bodyFake ? `    body: ${stringifyTsSample(bodyFake)},\n` : ''}${queryFake ? `    query: ${stringifyTsSample(queryFake)},\n` : ''}}`
+${[
+            bodyValidation ? `    body: ${getTsSample(bodyValidation)},` : null,
+            queryValidation ? `    query: ${getTsSample(queryValidation)},` : null,
+            paramsValidation ? `    params: ${getTsSample(paramsValidation)},` : null,
+        ]
+            .filter(Boolean)
+            .join('\n')}
+}`
         : '';
     const TS_CODE = `import { ${rpcName} } from '${packageName}';
 
-${iterationFake ? 'using' : 'const'} response = await ${rpcName}.${handlerName}(${tsArgs});
-${outputFake
+${iterationValidation ? 'using' : 'const'} response = await ${rpcName}.${handlerName}(${tsArgs});
+${outputValidation
         ? `
 console.log(response); 
 /* 
-${stringifyTsSample(outputFake, 0)}
+${getTsSample(outputValidation, 0)}
 */`
-        : ''}${iterationFake
+        : ''}${iterationValidation
         ? `
 for await (const item of response) {
     console.log(item); 
     /*
-    ${stringifyTsSample(iterationFake, 4)}
+    ${getTsSample(iterationValidation, 2)}
     */
 }`
         : ''}`;
     const PY_CODE = `from ${packageJson?.py_name ?? packageNameSnake} import ${rpcName}
 
-response = ${rpcName}.${handlerNameSnake}(${hasArg ? `\n    params=${paramsFake ? stringifyPySample(paramsFake) : 'None'},\n` : ''}${bodyFake ? `    body=${stringifyPySample(bodyFake)},\n` : ''}${queryFake ? `    query=${stringifyPySample(queryFake)},\n` : ''})
+response = ${rpcName}.${handlerNameSnake}(${hasArg
+        ? [
+            bodyValidation ? `    body=${getPySample(bodyValidation)},` : null,
+            queryValidation ? `    query=${getPySample(queryValidation)},` : null,
+            paramsValidation ? `    params=${getPySample(paramsValidation)},` : null,
+        ]
+            .filter(Boolean)
+            .join('\n')
+        : ''})
 
-${outputFake
-        ? `print(response)\n${JSON.stringify(outputFake, null, 2)
-            .split('\n')
-            .map((s) => `# ${s}`)
-            .join('\n')}`
-        : ''}${iterationFake
+${outputValidation ? `print(response)\n${getPySample(outputValidation, 0)}` : ''}${iterationValidation
         ? `for i, item in enumerate(response):
-    print(f"iteration #{i}:\\n {item}") 
-    # iteration #0: 
-${JSON.stringify(iterationFake, null, 2)
-            .split('\n')
-            .map((s) => `    # ${s}`)
-            .join('\n')}`
+    print(f"iteration #{i}:\\n {item}")
+    # iteration #0:
+${getPySample(iterationValidation, 2)}`
         : ''}`;
     const serdeUnwrap = (fake) => `from_value(json!(${fake})).unwrap()`;
     const RS_CODE = `use ${packageJson?.rs_name ?? packageNameSnake}::${rpcNameSnake};
@@ -80,29 +76,29 @@ use serde_json::{ from_value, json };
 
 pub fn main() {
   let response = ${rpcNameSnake}::${handlerNameSnake}(
-    ${bodyFake ? serdeUnwrap(stringifyPySample(bodyFake)) : '()'}, /* body */ 
-    ${queryFake ? serdeUnwrap(stringifyPySample(queryFake)) : '()'}, /* query */ 
-    ${paramsFake ? serdeUnwrap(stringifyPySample(paramsFake)) : '()'}, /* params */ 
+    ${bodyValidation ? serdeUnwrap(getRsSample(bodyValidation)) : '()'}, /* body */ 
+    ${queryValidation ? serdeUnwrap(getRsSample(queryValidation)) : '()'}, /* query */ 
+    ${paramsValidation ? serdeUnwrap(getRsSample(paramsValidation)) : '()'}, /* params */ 
     None, /* headers (HashMap) */ 
     None, /* api_root */ 
     false, /* disable_client_validation */
   );
 
-  ${outputFake
+  ${outputValidation
         ? `match response {
     Ok(output) => println!("{:?}", output),
     /* 
-    output ${stringifyPySample(outputFake, 4)} 
+    output ${getTsSample(outputValidation, 2)} 
     */
     Err(e) => println!("error: {:?}", e),
   }`
-        : ''}${iterationFake
+        : ''}${iterationValidation
         ? `match response {
       Ok(stream) => {
         for (i, item) in stream.enumerate() {
           println!("#{}: {:?}", i, item);
           /*
-          #0: iteration ${stringifyTsSample(iterationFake, 10)}
+          #0: iteration ${getTsSample(iterationValidation, 6)}
           */
         }
       },

package/mjs/utils/getJSONSchemaExample.d.ts

@@ -0,0 +1,8 @@
+import { KnownAny } from '../types';
+interface SamplerOptions {
+    comment?: '//' | '#';
+    stripQuotes?: boolean;
+    indent?: number;
+}
+export declare function getJSONSchemaExample(schema: KnownAny, options: SamplerOptions, rootSchema?: KnownAny): string;
+export {};

package/mjs/utils/getJSONSchemaExample.js

@@ -0,0 +1,234 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJSONSchemaExample = getJSONSchemaExample;
+function getJSONSchemaExample(schema, options, rootSchema) {
+    const { comment = '//', stripQuotes = false, indent = 0 } = options;
+    if (!schema || typeof schema !== 'object')
+        return 'null';
+    // Use the input schema as the root if not provided
+    rootSchema = rootSchema || schema;
+    // Get the sample value
+    const sampleValue = getSampleValue(schema, rootSchema);
+    // Format the output with descriptions
+    return formatWithDescriptions(sampleValue, schema, rootSchema, comment, stripQuotes, indent);
+}
+function getSampleValue(schema, rootSchema) {
+    if (!schema || typeof schema !== 'object')
+        return null;
+    // If there's an example, use it
+    if (schema.example !== undefined) {
+        return schema.example;
+    }
+    // If there are examples, use one of them
+    if (schema.examples && schema.examples.length > 0) {
+        return schema.examples[0];
+    }
+    // Handle const if present
+    if (schema.const !== undefined) {
+        return schema.const;
+    }
+    // Handle $ref if present
+    if (schema.$ref) {
+        return handleRef(schema.$ref, rootSchema);
+    }
+    // Handle enum if present
+    if (schema.enum && schema.enum.length > 0) {
+        return schema.enum[0];
+    }
+    // Handle oneOf, anyOf, allOf
+    if (schema.oneOf && schema.oneOf.length > 0) {
+        return getSampleValue(schema.oneOf[0], rootSchema);
+    }
+    if (schema.anyOf && schema.anyOf.length > 0) {
+        return getSampleValue(schema.anyOf[0], rootSchema);
+    }
+    if (schema.allOf && schema.allOf.length > 0) {
+        // Merge all schemas in allOf
+        const mergedSchema = schema.allOf.reduce((acc, s) => ({ ...acc, ...s }), {});
+        return getSampleValue(mergedSchema, rootSchema);
+    }
+    // Handle different types
+    if (schema.type) {
+        switch (schema.type) {
+            case 'string':
+                return handleString(schema);
+            case 'number':
+            case 'integer':
+                return handleNumber(schema);
+            case 'boolean':
+                return handleBoolean();
+            case 'object':
+                return handleObject(schema, rootSchema);
+            case 'array':
+                return handleArray(schema, rootSchema);
+            case 'null':
+                return null;
+            default:
+                return null;
+        }
+    }
+    // If type is not specified but properties are, treat it as an object
+    if (schema.properties) {
+        return handleObject(schema, rootSchema);
+    }
+    // Default fallback
+    return null;
+}
+function formatWithDescriptions(value, schema, rootSchema, comment, stripQuotes, indent) {
+    const indentStr = '  '.repeat(indent);
+    // Handle null
+    if (value === null) {
+        return 'null';
+    }
+    // Handle primitives
+    if (typeof value !== 'object' || value instanceof Date) {
+        return JSON.stringify(value);
+    }
+    // Handle arrays
+    if (Array.isArray(value)) {
+        if (value.length === 0)
+            return '[]';
+        const items = value.map((item) => {
+            const itemSchema = schema.items || {};
+            const formattedItem = formatWithDescriptions(item, itemSchema, rootSchema, comment, stripQuotes, indent + 1);
+            return `${indentStr}  ${formattedItem}`;
+        });
+        return `[\n${items.join(',\n')}\n${indentStr}]`;
+    }
+    // Handle objects
+    if (typeof value === 'object') {
+        const entries = Object.entries(value);
+        if (entries.length === 0)
+            return '{}';
+        const formattedEntries = [];
+        const isTopLevel = indent === 0;
+        // Add top-level description for objects
+        if (isTopLevel && schema.type === 'object' && schema.description) {
+            const descLines = schema.description.split('\n');
+            formattedEntries.push(`${indentStr}${comment} -----`);
+            descLines.forEach((line) => {
+                formattedEntries.push(`${indentStr}${comment} ${line.trim()}`);
+            });
+            formattedEntries.push(`${indentStr}${comment} -----`);
+        }
+        entries.forEach(([key, val], index) => {
+            const propSchema = schema.properties?.[key] || {};
+            // Handle $ref in property schema
+            let resolvedPropSchema = propSchema;
+            if (propSchema.$ref) {
+                resolvedPropSchema = resolveRef(propSchema.$ref, rootSchema);
+            }
+            // Add property description if it exists
+            if (resolvedPropSchema.description) {
+                const descLines = resolvedPropSchema.description.split('\n');
+                descLines.forEach((line) => {
+                    formattedEntries.push(`${indentStr}  ${comment} ${line.trim()}`);
+                });
+            }
+            // Format the key
+            const formattedKey = stripQuotes && /^[A-Za-z_$][0-9A-Za-z_$]*$/.test(key) ? key : JSON.stringify(key);
+            // Format the value
+            const formattedValue = formatWithDescriptions(val, resolvedPropSchema, rootSchema, comment, stripQuotes, indent + 1);
+            formattedEntries.push(`${indentStr}  ${formattedKey}: ${formattedValue}${index < entries.length - 1 ? ',' : ''}`);
+        });
+        return `{\n${formattedEntries.join('\n')}\n${indentStr}}`;
+    }
+    return JSON.stringify(value);
+}
+function resolveRef(ref, rootSchema) {
+    const path = ref.split('/').slice(1);
+    let current = rootSchema;
+    for (const segment of path) {
+        current = current[segment];
+        if (current === undefined) {
+            return {};
+        }
+    }
+    return current;
+}
+function handleRef(ref, rootSchema) {
+    const resolved = resolveRef(ref, rootSchema);
+    return getSampleValue(resolved, rootSchema);
+}
+function handleString(schema) {
+    if (schema.format) {
+        switch (schema.format) {
+            case 'email':
+            case 'idn-email':
+                return 'user@example.com';
+            case 'uri':
+            case 'url':
+            case 'iri':
+                return 'https://example.com';
+            case 'date':
+                return '2023-01-01';
+            case 'date-time':
+                return '2023-01-01T00:00:00Z';
+            case 'time':
+                return '12:00:00Z';
+            case 'duration':
+                return 'PT1H';
+            case 'uuid':
+                return '00000000-0000-0000-0000-000000000000';
+            case 'regex':
+                return '^[a-zA-Z0-9]+$';
+            case 'relative-json-pointer':
+                return '/some/relative/path';
+            case 'color':
+                return '#000000';
+            case 'hostname':
+                return 'example.com';
+            case 'zipcode':
+                return '12345';
+            case 'phone':
+                return '+123-456-7890';
+            case 'password':
+                return '******';
+            default:
+                return 'string';
+        }
+    }
+    if (schema.pattern) {
+        return 'pattern-string';
+    }
+    return 'string';
+}
+function handleNumber(schema) {
+    if (schema.minimum !== undefined && schema.maximum !== undefined) {
+        return schema.minimum;
+    }
+    else if (schema.minimum !== undefined) {
+        return schema.minimum;
+    }
+    else if (schema.maximum !== undefined) {
+        return schema.maximum;
+    }
+    return 0;
+}
+function handleBoolean() {
+    return true;
+}
+function handleObject(schema, rootSchema) {
+    const result = {};
+    if (schema.properties) {
+        const required = schema.required || [];
+        for (const [key, propSchema] of Object.entries(schema.properties)) {
+            if (required.includes(key) || required.length === 0) {
+                result[key] = getSampleValue(propSchema, rootSchema);
+            }
+        }
+    }
+    if (schema.additionalProperties && typeof schema.additionalProperties === 'object') {
+        result['additionalProp'] = getSampleValue(schema.additionalProperties, rootSchema);
+    }
+    return result;
+}
+function handleArray(schema, rootSchema) {
+    if (schema.items) {
+        const itemSchema = schema.items;
+        const minItems = schema.minItems || 1;
+        const numItems = Math.min(minItems, 3);
+        return Array.from({ length: numItems }, () => getSampleValue(itemSchema, rootSchema));
+    }
+    return [];
+}

package/mjs/utils/getJSONSchemaSample.d.ts

@@ -0,0 +1,2 @@
+import { KnownAny } from '../types';
+export declare function getJSONSchemaSample(schema: KnownAny, rootSchema?: KnownAny): KnownAny;

package/mjs/utils/{jsonSchemaSampler.js → getJSONSchemaSample.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonSchemaSampler = jsonSchemaSampler;
-function jsonSchemaSampler(schema, rootSchema) {
+exports.getJSONSchemaSample = getJSONSchemaSample;
+function getJSONSchemaSample(schema, rootSchema) {
     if (!schema || typeof schema !== 'object')
         return null;
     // Use the input schema as the root if not provided
@@ -28,15 +28,15 @@ function jsonSchemaSampler(schema, rootSchema) {
     }
     // Handle oneOf, anyOf, allOf
     if (schema.oneOf && schema.oneOf.length > 0) {
-        return jsonSchemaSampler(schema.oneOf[0], rootSchema);
+        return getJSONSchemaSample(schema.oneOf[0], rootSchema);
     }
     if (schema.anyOf && schema.anyOf.length > 0) {
-        return jsonSchemaSampler(schema.anyOf[0], rootSchema);
+        return getJSONSchemaSample(schema.anyOf[0], rootSchema);
     }
     if (schema.allOf && schema.allOf.length > 0) {
         // Merge all schemas in allOf
         const mergedSchema = schema.allOf.reduce((acc, s) => ({ ...acc, ...s }), {});
-        return jsonSchemaSampler(mergedSchema, rootSchema);
+        return getJSONSchemaSample(mergedSchema, rootSchema);
     }
     // Handle different types
     if (schema.type) {
@@ -77,7 +77,7 @@ function handleRef(ref, rootSchema) {
         }
     }
     // Process the referenced schema
-    return jsonSchemaSampler(current, rootSchema);
+    return getJSONSchemaSample(current, rootSchema);
 }
 function handleString(schema) {
     if (schema.format) {
@@ -145,13 +145,13 @@ function handleObject(schema, rootSchema) {
         for (const [key, propSchema] of Object.entries(schema.properties)) {
             // Only include required properties or as a basic example
             if (required.includes(key) || required.length === 0) {
-                result[key] = jsonSchemaSampler(propSchema, rootSchema);
+                result[key] = getJSONSchemaSample(propSchema, rootSchema);
             }
         }
     }
     // Handle additionalProperties
     if (schema.additionalProperties && typeof schema.additionalProperties === 'object') {
-        result['additionalProp'] = jsonSchemaSampler(schema.additionalProperties, rootSchema);
+        result['additionalProp'] = getJSONSchemaSample(schema.additionalProperties, rootSchema);
     }
     return result;
 }
@@ -161,7 +161,7 @@ function handleArray(schema, rootSchema) {
         const minItems = schema.minItems || 1;
         // Create minimum number of items (capped at a reasonable max for examples)
         const numItems = Math.min(minItems, 3);
-        return Array.from({ length: numItems }, () => jsonSchemaSampler(itemSchema, rootSchema));
+        return Array.from({ length: numItems }, () => getJSONSchemaSample(itemSchema, rootSchema));
     }
     return [];
 }

package/package.json

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

package/cjs/utils/jsonSchemaSampler.d.ts

@@ -1,2 +0,0 @@
-import { KnownAny } from '../types';
-export declare function jsonSchemaSampler(schema: KnownAny, rootSchema?: KnownAny): KnownAny;

package/mjs/utils/jsonSchemaSampler.d.ts

@@ -1,2 +0,0 @@
-import { KnownAny } from '../types';
-export declare function jsonSchemaSampler(schema: KnownAny, rootSchema?: KnownAny): KnownAny;