vovk 3.0.0-draft.366 → 3.0.0-draft.367

package/cjs/types.d.ts

@@ -258,6 +258,12 @@ export type VovkSimpleJSONSchema = {
     anyOf?: VovkSimpleJSONSchema[];
     oneOf?: VovkSimpleJSONSchema[];
     allOf?: VovkSimpleJSONSchema[];
+    const?: KnownAny;
+    example?: KnownAny;
+    contentEncoding?: string;
+    contentMediaType?: string;
+    minLength?: number;
+    maxLength?: number;
     [key: `x-${string}`]: KnownAny;
 };
 export declare enum VovkSchemaIdEnum {

package/cjs/utils/createCodeExamples.js

@@ -8,25 +8,67 @@ const toSnakeCase = (str) => str
     .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, }) {
-    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 getIndentSpaces = (level) => ' '.repeat(level);
+function isTextFormat(mimeType) {
+    if (!mimeType)
+        return false;
+    return (mimeType.startsWith('text/') ||
+        [
+            'application/json',
+            'application/ld+json',
+            'application/xml',
+            'application/xhtml+xml',
+            'application/javascript',
+            'application/typescript',
+            'application/yaml',
+            'application/x-yaml',
+            'application/toml',
+            'application/sql',
+            'application/graphql',
+            'application/x-www-form-urlencoded',
+        ].includes(mimeType) ||
+        mimeType.endsWith('+json') ||
+        mimeType.endsWith('+xml'));
+}
+function generateTypeScriptCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, hasArg, }) {
     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);
-    const packageName = packageJson?.name || 'vovk-client';
-    const packageNameSnake = toSnakeCase(packageName);
+    const getTsFormSample = (schema, indent, nesting = 0) => {
+        let formSample = 'const form = new FormData();';
+        for (const [key, prop] of Object.entries(schema.properties || {})) {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            let sampleValue;
+            if (target.type === 'string' && target.format === 'binary') {
+                sampleValue = `new Blob(${isTextFormat(target.contentMediaType) ? '["text_content"]' : '[binary_data]'}${target.contentMediaType ? `, { type: "${target.contentMediaType}" }` : ''})`;
+            }
+            else if (target.type === 'array') {
+                if (nesting === 0 && target.items) {
+                    sampleValue +=
+                        getTsFormSample(target.items, indent, nesting + 1) + getTsFormSample(target.items, indent, nesting + 1);
+                }
+                else {
+                    sampleValue += '"array_unknown"';
+                }
+            }
+            else if (target.type === 'object') {
+                sampleValue += '"object_unknown"';
+            }
+            else {
+                sampleValue += `"${(0, getJSONSchemaExample_1.getSampleValue)(target)}"`;
+            }
+            formSample += `\nform.append("${key}", ${sampleValue});`;
+        }
+        return formSample;
+    };
+    const getBody = (schema) => {
+        if (schema['x-isForm']) {
+            return getTsFormSample(schema);
+        }
+        return 'form';
+    };
     const tsArgs = hasArg
         ? `{
 ${[
-            bodyValidation ? `    body: ${getTsSample(bodyValidation)},` : null,
+            bodyValidation ? `    body: ${getBody(bodyValidation)},` : null,
             queryValidation ? `    query: ${getTsSample(queryValidation)},` : null,
             paramsValidation ? `    params: ${getTsSample(paramsValidation)},` : null,
         ]
@@ -52,12 +94,45 @@ for await (const item of response) {
     */
 }`
         : ''}`;
-    const PY_CODE = `from ${packageJson?.py_name ?? packageNameSnake} import ${rpcName}
+    return TS_CODE.trim();
+}
+function generatePythonCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, hasArg, }) {
+    const getPySample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4, comment: '#' });
+    const handlerNameSnake = toSnakeCase(handlerName);
+    const getPyData = (schema) => {
+        const noFileSchema = {
+            ...schema,
+            properties: schema.properties
+                ? Object.fromEntries(Object.entries(schema.properties).filter(([, prop]) => prop.format !== 'binary' || prop.items?.format !== 'binary'))
+                : {},
+        };
+        return getPySample(noFileSchema);
+    };
+    const getFileTouple = (schema) => {
+        return `('name.ext', BytesIO(${isTextFormat(schema.contentMediaType) ? '"text_content".encode("utf-8")' : 'binary_data'}${schema.contentMediaType ? `"${schema.contentMediaType}"` : ''}))`;
+    };
+    const getPyFiles = (schema, indent) => {
+        return Object.entries(schema.properties ?? {}).reduce((acc, [key, prop]) => {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            if (target.format === 'binary') {
+                acc.push(`('${key}', ${getFileTouple(target)})`);
+            }
+            else if (target.type === 'array' && target.items?.format === 'binary') {
+                const val = `${getIndentSpaces(indent ?? 4)}('${key}', ${getFileTouple(target.items)})`;
+                acc.push(val, val);
+            }
+            return acc;
+        }, []);
+    };
+    const pyFiles = bodyValidation ? getPyFiles(bodyValidation) : null;
+    const pyFilesArg = pyFiles ? `files=[\n${pyFiles.join(', ')}\n]` : null;
+    const PY_CODE = `from ${packageName} import ${rpcName}
 
 response = ${rpcName}.${handlerNameSnake}(${hasArg
         ? '\n' +
             [
-                bodyValidation ? `    body=${getPySample(bodyValidation)},` : null,
+                bodyValidation ? `    body=${getPyData(bodyValidation)},` : null,
+                pyFilesArg,
                 queryValidation ? `    query=${getPySample(queryValidation)},` : null,
                 paramsValidation ? `    params=${getPySample(paramsValidation)},` : null,
             ]
@@ -72,18 +147,64 @@ ${outputValidation ? `print(response)\n${getPySample(outputValidation, 0)}` : ''
     # iteration #0:
     ${getPySample(iterationValidation)}`
         : ''}`;
+    return PY_CODE.trim();
+}
+function generateRustCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, }) {
+    const getRsJSONSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4 });
+    const getRsOutputSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: true, indent: indent ?? 4 });
+    const getRsFormSample = (schema, indent, nesting = 0) => {
+        let formSample = 'let form = multipart::Form::new()';
+        for (const [key, prop] of Object.entries(schema.properties || {})) {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            let sampleValue; // = value.type === 'object' ? 'object_unknown' : getSampleValue(value);
+            if (target.type === 'string' && target.format === 'binary') {
+                sampleValue = isTextFormat(target.contentMediaType)
+                    ? 'multipart::Part::text("text_content")'
+                    : 'multipart::Part::bytes(binary_data)';
+                if (target.contentMediaType) {
+                    sampleValue += `.mime_str("${target.contentMediaType}").unwrap()`;
+                }
+            }
+            else if (prop.type === 'array') {
+                if (nesting === 0 && prop.items) {
+                    sampleValue =
+                        getRsFormSample(prop.items, indent, nesting + 1) + getRsFormSample(prop.items, indent, nesting + 1);
+                }
+                else {
+                    sampleValue = '"array_unknown"';
+                }
+            }
+            else if (target.type === 'object') {
+                sampleValue = '"object_unknown"';
+            }
+            else {
+                sampleValue = `"${(0, getJSONSchemaExample_1.getSampleValue)(target)}"`;
+            }
+            formSample += `\n${getIndentSpaces(indent ?? 4)}.part("${key}", ${sampleValue});`;
+        }
+        return formSample;
+    };
+    const getBody = (schema) => {
+        if (schema['x-isForm']) {
+            return 'form';
+        }
+        return serdeUnwrap(getRsJSONSample(schema));
+    };
+    const handlerNameSnake = toSnakeCase(handlerName);
+    const rpcNameSnake = toSnakeCase(rpcName);
     const serdeUnwrap = (fake) => `from_value(json!(${fake})).unwrap()`;
-    const RS_CODE = `use ${packageJson?.rs_name ?? packageNameSnake}::${rpcNameSnake};
+    const RS_CODE = `use ${packageName}::${rpcNameSnake};
 use serde_json::{ 
   from_value, 
   json 
 };
+${bodyValidation?.['x-isForm'] ? `use multipart;` : ''}
 
-pub fn main() {
+pub fn main() {${bodyValidation?.['x-isForm'] ? '\n  ' + getRsFormSample(bodyValidation) : ''}
   let response = ${rpcNameSnake}::${handlerNameSnake}(
-    ${bodyValidation ? serdeUnwrap(getRsSample(bodyValidation)) : '()'}, /* body */ 
-    ${queryValidation ? serdeUnwrap(getRsSample(queryValidation)) : '()'}, /* query */ 
-    ${paramsValidation ? serdeUnwrap(getRsSample(paramsValidation)) : '()'}, /* params */ 
+    ${bodyValidation ? getBody(bodyValidation) : '()'}, /* body */ 
+    ${queryValidation ? serdeUnwrap(getRsJSONSample(queryValidation)) : '()'}, /* query */ 
+    ${paramsValidation ? serdeUnwrap(getRsJSONSample(paramsValidation)) : '()'}, /* params */ 
     None, /* headers (HashMap) */ 
     None, /* api_root */ 
     false, /* disable_client_validation */
@@ -91,7 +212,7 @@ pub fn main() {
         ? `\n\nmatch response {
     Ok(output) => println!("{:?}", output),
     /* 
-    output ${getTsSample(outputValidation)} 
+    output ${getRsOutputSample(outputValidation)} 
     */
     Err(e) => println!("error: {:?}", e),
   }`
@@ -101,7 +222,7 @@ pub fn main() {
       for (i, item) in stream.enumerate() {
         println!("#{}: {:?}", i, item);
         /*
-        #0: iteration ${getTsSample(iterationValidation, 8)}
+        #0: iteration ${getRsOutputSample(iterationValidation, 8)}
         */
       }
     },
@@ -109,5 +230,33 @@ pub fn main() {
   }`
         : ''}
 }`;
-    return { ts: TS_CODE.trim(), py: PY_CODE.trim(), rs: RS_CODE.trim() };
+    return RS_CODE.trim();
+}
+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 hasArg = !!queryValidation || !!bodyValidation || !!paramsValidation;
+    const rpcName = controllerSchema.rpcModuleName;
+    const packageName = packageJson?.name || 'vovk-client';
+    const packageNameSnake = toSnakeCase(packageName);
+    const pyPackageName = packageJson?.py_name ?? packageNameSnake;
+    const rsPackageName = packageJson?.rs_name ?? packageNameSnake;
+    const commonParams = {
+        handlerName,
+        rpcName,
+        packageName,
+        queryValidation,
+        bodyValidation,
+        paramsValidation,
+        outputValidation,
+        iterationValidation,
+        hasArg,
+    };
+    const ts = generateTypeScriptCode(commonParams);
+    const py = generatePythonCode({ ...commonParams, packageName: pyPackageName });
+    const rs = generateRustCode({ ...commonParams, packageName: rsPackageName });
+    return { ts, py, rs };
 }

package/cjs/utils/getJSONSchemaExample.d.ts

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

package/cjs/utils/getJSONSchemaExample.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJSONSchemaExample = getJSONSchemaExample;
+exports.getSampleValue = getSampleValue;
 function getJSONSchemaExample(schema, options, rootSchema) {
     const { comment = '//', stripQuotes = false, indent = 0 } = options;
     if (!schema || typeof schema !== 'object')
@@ -15,6 +16,7 @@ function getJSONSchemaExample(schema, options, rootSchema) {
 function getSampleValue(schema, rootSchema) {
     if (!schema || typeof schema !== 'object')
         return null;
+    rootSchema = rootSchema || schema;
     // If there's an example, use it
     if (schema.example !== undefined) {
         return schema.example;

package/mjs/types.d.ts

@@ -258,6 +258,12 @@ export type VovkSimpleJSONSchema = {
     anyOf?: VovkSimpleJSONSchema[];
     oneOf?: VovkSimpleJSONSchema[];
     allOf?: VovkSimpleJSONSchema[];
+    const?: KnownAny;
+    example?: KnownAny;
+    contentEncoding?: string;
+    contentMediaType?: string;
+    minLength?: number;
+    maxLength?: number;
     [key: `x-${string}`]: KnownAny;
 };
 export declare enum VovkSchemaIdEnum {

package/mjs/utils/createCodeExamples.js

@@ -8,25 +8,67 @@ const toSnakeCase = (str) => str
     .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, }) {
-    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 getIndentSpaces = (level) => ' '.repeat(level);
+function isTextFormat(mimeType) {
+    if (!mimeType)
+        return false;
+    return (mimeType.startsWith('text/') ||
+        [
+            'application/json',
+            'application/ld+json',
+            'application/xml',
+            'application/xhtml+xml',
+            'application/javascript',
+            'application/typescript',
+            'application/yaml',
+            'application/x-yaml',
+            'application/toml',
+            'application/sql',
+            'application/graphql',
+            'application/x-www-form-urlencoded',
+        ].includes(mimeType) ||
+        mimeType.endsWith('+json') ||
+        mimeType.endsWith('+xml'));
+}
+function generateTypeScriptCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, hasArg, }) {
     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);
-    const packageName = packageJson?.name || 'vovk-client';
-    const packageNameSnake = toSnakeCase(packageName);
+    const getTsFormSample = (schema, indent, nesting = 0) => {
+        let formSample = 'const form = new FormData();';
+        for (const [key, prop] of Object.entries(schema.properties || {})) {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            let sampleValue;
+            if (target.type === 'string' && target.format === 'binary') {
+                sampleValue = `new Blob(${isTextFormat(target.contentMediaType) ? '["text_content"]' : '[binary_data]'}${target.contentMediaType ? `, { type: "${target.contentMediaType}" }` : ''})`;
+            }
+            else if (target.type === 'array') {
+                if (nesting === 0 && target.items) {
+                    sampleValue +=
+                        getTsFormSample(target.items, indent, nesting + 1) + getTsFormSample(target.items, indent, nesting + 1);
+                }
+                else {
+                    sampleValue += '"array_unknown"';
+                }
+            }
+            else if (target.type === 'object') {
+                sampleValue += '"object_unknown"';
+            }
+            else {
+                sampleValue += `"${(0, getJSONSchemaExample_1.getSampleValue)(target)}"`;
+            }
+            formSample += `\nform.append("${key}", ${sampleValue});`;
+        }
+        return formSample;
+    };
+    const getBody = (schema) => {
+        if (schema['x-isForm']) {
+            return getTsFormSample(schema);
+        }
+        return 'form';
+    };
     const tsArgs = hasArg
         ? `{
 ${[
-            bodyValidation ? `    body: ${getTsSample(bodyValidation)},` : null,
+            bodyValidation ? `    body: ${getBody(bodyValidation)},` : null,
             queryValidation ? `    query: ${getTsSample(queryValidation)},` : null,
             paramsValidation ? `    params: ${getTsSample(paramsValidation)},` : null,
         ]
@@ -52,12 +94,45 @@ for await (const item of response) {
     */
 }`
         : ''}`;
-    const PY_CODE = `from ${packageJson?.py_name ?? packageNameSnake} import ${rpcName}
+    return TS_CODE.trim();
+}
+function generatePythonCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, hasArg, }) {
+    const getPySample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4, comment: '#' });
+    const handlerNameSnake = toSnakeCase(handlerName);
+    const getPyData = (schema) => {
+        const noFileSchema = {
+            ...schema,
+            properties: schema.properties
+                ? Object.fromEntries(Object.entries(schema.properties).filter(([, prop]) => prop.format !== 'binary' || prop.items?.format !== 'binary'))
+                : {},
+        };
+        return getPySample(noFileSchema);
+    };
+    const getFileTouple = (schema) => {
+        return `('name.ext', BytesIO(${isTextFormat(schema.contentMediaType) ? '"text_content".encode("utf-8")' : 'binary_data'}${schema.contentMediaType ? `"${schema.contentMediaType}"` : ''}))`;
+    };
+    const getPyFiles = (schema, indent) => {
+        return Object.entries(schema.properties ?? {}).reduce((acc, [key, prop]) => {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            if (target.format === 'binary') {
+                acc.push(`('${key}', ${getFileTouple(target)})`);
+            }
+            else if (target.type === 'array' && target.items?.format === 'binary') {
+                const val = `${getIndentSpaces(indent ?? 4)}('${key}', ${getFileTouple(target.items)})`;
+                acc.push(val, val);
+            }
+            return acc;
+        }, []);
+    };
+    const pyFiles = bodyValidation ? getPyFiles(bodyValidation) : null;
+    const pyFilesArg = pyFiles ? `files=[\n${pyFiles.join(', ')}\n]` : null;
+    const PY_CODE = `from ${packageName} import ${rpcName}
 
 response = ${rpcName}.${handlerNameSnake}(${hasArg
         ? '\n' +
             [
-                bodyValidation ? `    body=${getPySample(bodyValidation)},` : null,
+                bodyValidation ? `    body=${getPyData(bodyValidation)},` : null,
+                pyFilesArg,
                 queryValidation ? `    query=${getPySample(queryValidation)},` : null,
                 paramsValidation ? `    params=${getPySample(paramsValidation)},` : null,
             ]
@@ -72,18 +147,64 @@ ${outputValidation ? `print(response)\n${getPySample(outputValidation, 0)}` : ''
     # iteration #0:
     ${getPySample(iterationValidation)}`
         : ''}`;
+    return PY_CODE.trim();
+}
+function generateRustCode({ handlerName, rpcName, packageName, queryValidation, bodyValidation, paramsValidation, outputValidation, iterationValidation, }) {
+    const getRsJSONSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: false, indent: indent ?? 4 });
+    const getRsOutputSample = (schema, indent) => (0, getJSONSchemaExample_1.getJSONSchemaExample)(schema, { stripQuotes: true, indent: indent ?? 4 });
+    const getRsFormSample = (schema, indent, nesting = 0) => {
+        let formSample = 'let form = multipart::Form::new()';
+        for (const [key, prop] of Object.entries(schema.properties || {})) {
+            const target = prop.oneOf?.[0] || prop.anyOf?.[0] || prop.allOf?.[0] || prop;
+            let sampleValue; // = value.type === 'object' ? 'object_unknown' : getSampleValue(value);
+            if (target.type === 'string' && target.format === 'binary') {
+                sampleValue = isTextFormat(target.contentMediaType)
+                    ? 'multipart::Part::text("text_content")'
+                    : 'multipart::Part::bytes(binary_data)';
+                if (target.contentMediaType) {
+                    sampleValue += `.mime_str("${target.contentMediaType}").unwrap()`;
+                }
+            }
+            else if (prop.type === 'array') {
+                if (nesting === 0 && prop.items) {
+                    sampleValue =
+                        getRsFormSample(prop.items, indent, nesting + 1) + getRsFormSample(prop.items, indent, nesting + 1);
+                }
+                else {
+                    sampleValue = '"array_unknown"';
+                }
+            }
+            else if (target.type === 'object') {
+                sampleValue = '"object_unknown"';
+            }
+            else {
+                sampleValue = `"${(0, getJSONSchemaExample_1.getSampleValue)(target)}"`;
+            }
+            formSample += `\n${getIndentSpaces(indent ?? 4)}.part("${key}", ${sampleValue});`;
+        }
+        return formSample;
+    };
+    const getBody = (schema) => {
+        if (schema['x-isForm']) {
+            return 'form';
+        }
+        return serdeUnwrap(getRsJSONSample(schema));
+    };
+    const handlerNameSnake = toSnakeCase(handlerName);
+    const rpcNameSnake = toSnakeCase(rpcName);
     const serdeUnwrap = (fake) => `from_value(json!(${fake})).unwrap()`;
-    const RS_CODE = `use ${packageJson?.rs_name ?? packageNameSnake}::${rpcNameSnake};
+    const RS_CODE = `use ${packageName}::${rpcNameSnake};
 use serde_json::{ 
   from_value, 
   json 
 };
+${bodyValidation?.['x-isForm'] ? `use multipart;` : ''}
 
-pub fn main() {
+pub fn main() {${bodyValidation?.['x-isForm'] ? '\n  ' + getRsFormSample(bodyValidation) : ''}
   let response = ${rpcNameSnake}::${handlerNameSnake}(
-    ${bodyValidation ? serdeUnwrap(getRsSample(bodyValidation)) : '()'}, /* body */ 
-    ${queryValidation ? serdeUnwrap(getRsSample(queryValidation)) : '()'}, /* query */ 
-    ${paramsValidation ? serdeUnwrap(getRsSample(paramsValidation)) : '()'}, /* params */ 
+    ${bodyValidation ? getBody(bodyValidation) : '()'}, /* body */ 
+    ${queryValidation ? serdeUnwrap(getRsJSONSample(queryValidation)) : '()'}, /* query */ 
+    ${paramsValidation ? serdeUnwrap(getRsJSONSample(paramsValidation)) : '()'}, /* params */ 
     None, /* headers (HashMap) */ 
     None, /* api_root */ 
     false, /* disable_client_validation */
@@ -91,7 +212,7 @@ pub fn main() {
         ? `\n\nmatch response {
     Ok(output) => println!("{:?}", output),
     /* 
-    output ${getTsSample(outputValidation)} 
+    output ${getRsOutputSample(outputValidation)} 
     */
     Err(e) => println!("error: {:?}", e),
   }`
@@ -101,7 +222,7 @@ pub fn main() {
       for (i, item) in stream.enumerate() {
         println!("#{}: {:?}", i, item);
         /*
-        #0: iteration ${getTsSample(iterationValidation, 8)}
+        #0: iteration ${getRsOutputSample(iterationValidation, 8)}
         */
       }
     },
@@ -109,5 +230,33 @@ pub fn main() {
   }`
         : ''}
 }`;
-    return { ts: TS_CODE.trim(), py: PY_CODE.trim(), rs: RS_CODE.trim() };
+    return RS_CODE.trim();
+}
+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 hasArg = !!queryValidation || !!bodyValidation || !!paramsValidation;
+    const rpcName = controllerSchema.rpcModuleName;
+    const packageName = packageJson?.name || 'vovk-client';
+    const packageNameSnake = toSnakeCase(packageName);
+    const pyPackageName = packageJson?.py_name ?? packageNameSnake;
+    const rsPackageName = packageJson?.rs_name ?? packageNameSnake;
+    const commonParams = {
+        handlerName,
+        rpcName,
+        packageName,
+        queryValidation,
+        bodyValidation,
+        paramsValidation,
+        outputValidation,
+        iterationValidation,
+        hasArg,
+    };
+    const ts = generateTypeScriptCode(commonParams);
+    const py = generatePythonCode({ ...commonParams, packageName: pyPackageName });
+    const rs = generateRustCode({ ...commonParams, packageName: rsPackageName });
+    return { ts, py, rs };
 }

package/mjs/utils/getJSONSchemaExample.d.ts

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

package/mjs/utils/getJSONSchemaExample.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJSONSchemaExample = getJSONSchemaExample;
+exports.getSampleValue = getSampleValue;
 function getJSONSchemaExample(schema, options, rootSchema) {
     const { comment = '//', stripQuotes = false, indent = 0 } = options;
     if (!schema || typeof schema !== 'object')
@@ -15,6 +16,7 @@ function getJSONSchemaExample(schema, options, rootSchema) {
 function getSampleValue(schema, rootSchema) {
     if (!schema || typeof schema !== 'object')
         return null;
+    rootSchema = rootSchema || schema;
     // If there's an example, use it
     if (schema.example !== undefined) {
         return schema.example;

package/package.json

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