vovk-cli 0.0.1-draft.202 → 0.0.1-draft.203

package/client-templates/schemaCjs/schema.cjs.ejs

@@ -1,4 +1,8 @@
 <%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<% if(t.isTsStandalone) { %>
+const schema = require('./schema.json');
+module.exports.schema = schema;
+<% } else { %>
 const meta = require('./<%= t.schemaOutDir %>/_meta.json');
 const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
     '<%= segment.segmentName %>': require('./<%= t.schemaOutDir %>/<%= segment.segmentName || t.ROOT_SEGMENT_FILE_NAME %>.json'),<% }) %>
@@ -7,9 +11,10 @@ const schema = {
   $schema: '<%- t.VovkSchemaIdEnum.SCHEMA %>',
   segments,
   meta: {
-    apiRoot: '<%= t.apiRoot %>',
+    apiRoot: '<%= t.apiRoot %>', // for debugging purposes
     ...meta
   }
 };
 
 module.exports.schema = schema;
+<% } %>

package/client-templates/schemaTs/schema.ts.ejs

@@ -1,4 +1,8 @@
 <%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<% if(t.isTsStandalone) { %>
+import schema from './schema.json' with { type: "json" };
+export { schema };
+<% } else { %>
 import meta from './<%= t.schemaOutDir %>/_meta.json' with { type: "json" };
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
 import segment<%= i %> from './<%= t.schemaOutDir %>/<%= segment.segmentName || t.ROOT_SEGMENT_FILE_NAME %>.json' with { type: "json" };
@@ -11,7 +15,8 @@ export const schema = {
   $schema: '<%- t.VovkSchemaIdEnum.SCHEMA %>',
   segments,
   meta: {
-    apiRoot: '<%= t.apiRoot %>',
+    apiRoot: '<%= t.apiRoot %>', // for debugging purposes
     ...meta,
   }
-};
+};
+<% } %>

package/client-templates/standaloneTypesTs/types.d.ts.ejs

@@ -0,0 +1,12 @@
+import type { VovkRequest, VovkStreamAsyncIterable, KnownAny } from 'vovk';
+<% Object.entries(t.schema.segments).forEach(([segmentName, segment], i) => {
+    Object.values(segment.controllers).forEach((controllerSchema) => { %>
+
+export type Segment<%= i %><%= controllerSchema.originalControllerName ?? controllerSchema.rpcModuleName + 'Controller' %> = {
+<% Object.entries(controllerSchema.handlers).forEach(([handlerName, handler]) => { %>
+  <%= handlerName %>: (req: VovkRequest<<%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.body) ?? 'KnownAny' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.query) ?? 'KnownAny' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.params ?? 'KnownAny') %>>): <%= validation?.output ? `Promise<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.body)}>` : validation?.iteration ? `Promise<VovkStreamAsyncIterable<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.iteration)}>>` : 'Promise<KnownAny>' %>:
+<% }) %>
+};
+<% }) %>
+<% }) %>
+

package/dist/bundle/index.mjs

@@ -7,8 +7,8 @@ import { BuiltInTemplateName } from '../getProjectInfo/getConfig/getTemplateDefs
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import { locateSegments } from '../locateSegments.mjs';
 export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
-    const { config, log, cwd, apiDir } = projectInfo;
-    const locatedSegments = await locateSegments({ dir: path.join(cwd, apiDir), config, log });
+    const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
+    const locatedSegments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const { bundle: bundleConfig } = config;
     const tsFullClientOutAbsoluteDirInput = path.join(cwd, bundleConfig.tsClientOutDir);
     const tsClientOutDir = cliBundleOptions?.tsClientOutDir ?? bundleConfig.tsClientOutDir;

package/dist/dev/index.mjs

@@ -41,9 +41,11 @@ export class VovkDev {
     }
     #watchSegments = (callback) => {
         const segmentReg = /\/?\[\[\.\.\.[a-zA-Z-_]+\]\]\/route.ts$/;
-        const { cwd, log, config, apiDir } = this.#projectInfo;
+        const { cwd, log, config, apiDirAbsolutePath } = this.#projectInfo;
+        if (!apiDirAbsolutePath) {
+            throw new Error('Unable to watch segments. It looks like CWD is not a Next.js app.');
+        }
         const schemaOutAbsolutePath = path.resolve(cwd, this.#schemaOut ?? config.schemaOutDir);
-        const apiDirAbsolutePath = path.join(cwd, apiDir);
         const getSegmentName = (filePath) => path.relative(apiDirAbsolutePath, filePath).replace(segmentReg, '');
         log.debug(`Watching segments at ${apiDirAbsolutePath}`);
         this.#segmentWatcher = chokidar
@@ -161,8 +163,8 @@ export class VovkDev {
         let isReady = false;
         const handle = debounce(async () => {
             this.#projectInfo = await getProjectInfo();
-            const { config, apiDir } = this.#projectInfo;
-            this.#segments = await locateSegments({ dir: path.join(cwd, apiDir), config, log });
+            const { config, apiDirAbsolutePath } = this.#projectInfo;
+            this.#segments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
             await this.#modulesWatcher?.close();
             await this.#segmentWatcher?.close();
             await Promise.all([
@@ -316,8 +318,8 @@ export class VovkDev {
     async start({ exit }) {
         const now = Date.now();
         this.#projectInfo = await getProjectInfo();
-        const { log, config, cwd, apiDir } = this.#projectInfo;
-        this.#segments = await locateSegments({ dir: path.join(cwd, apiDir), config, log });
+        const { log, config, cwd, apiDirAbsolutePath } = this.#projectInfo;
+        this.#segments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
         log.info('Starting...');
         if (exit) {
             this.#onFirstTimeGenerate = once(() => {

package/dist/generate/generate.mjs

@@ -56,8 +56,9 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
         // sort segments by name to avoid unnecessary rendering
         segments: Object.fromEntries(Object.entries(fullSchema.segments).sort(([a], [b]) => a.localeCompare(b))),
     };
-    const { config, cwd, log } = projectInfo;
+    const { config, cwd, log, srcRoot } = projectInfo;
     const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
+    const isTsStandalone = cliGenerateOptions?.forceTsStandalone ?? !srcRoot;
     const isComposedEnabled = cliGenerateOptions?.composedOnly ||
         !!cliGenerateOptions?.composedFrom ||
         !!cliGenerateOptions?.composedOut ||
@@ -110,6 +111,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 templateDef,
                 locatedSegments,
                 isNodeNextResolution,
+                isTsStandalone,
             });
             const outAbsoluteDir = path.join(cwd, outCwdRelativeDir);
             return {
@@ -181,6 +183,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                     templateDef,
                     locatedSegments,
                     isNodeNextResolution,
+                    isTsStandalone,
                 });
                 return {
                     written,

package/dist/generate/index.mjs

@@ -30,8 +30,8 @@ export class VovkGenerate {
         }
     }
     async generate({ fullSchema }) {
-        const { log, config, apiDir, cwd } = this.#projectInfo;
-        const locatedSegments = await locateSegments({ dir: path.join(cwd, apiDir), config, log });
+        const { log, config, apiDirAbsolutePath } = this.#projectInfo;
+        const locatedSegments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
         await generate({
             projectInfo: this.#projectInfo,
             fullSchema,

package/dist/generate/writeOneClientFile.d.mts

@@ -4,7 +4,7 @@ import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
 import type { ClientImports } from './getTemplateClientImports.mjs';
 import type { Segment } from '../locateSegments.mjs';
-export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, isTsStandalone, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -26,6 +26,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     templateDef: VovkStrictConfig['clientTemplateDefs'][string];
     locatedSegments: Segment[];
     isNodeNextResolution: boolean;
+    isTsStandalone: boolean;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -7,7 +7,8 @@ import * as YAML from 'yaml';
 import TOML from '@iarna/toml';
 import prettify from '../utils/prettify.mjs';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, }) {
+import { convertJSONSchemaToTypeScriptDef } from '../utils/convertJSONSchemaToTypeScriptDef.mjs';
+export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, isTsStandalone, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -19,6 +20,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
     // Data for the EJS templates:
     const t = {
         _, // lodash
+        isTsStandalone,
         package: packageJson,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : apiRoot,
@@ -26,6 +28,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
         schema: fullSchema,
         VovkSchemaIdEnum,
         createCodeExamples,
+        convertJSONSchemaToTypeScriptDef,
         YAML,
         TOML,
         nodeNextResolutionExt: {

package/dist/getProjectInfo/getConfig/getTemplateDefs.d.mts

@@ -6,6 +6,7 @@ export declare enum BuiltInTemplateName {
     schemaTs = "schemaTs",
     schemaCjs = "schemaCjs",
     schemaJson = "schemaJson",
+    standaloneTypesTs = "standaloneTypesTs",
     readme = "readme",
     packageJson = "packageJson",
     rs = "rs",

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -8,6 +8,8 @@ export var BuiltInTemplateName;
     BuiltInTemplateName["schemaTs"] = "schemaTs";
     BuiltInTemplateName["schemaCjs"] = "schemaCjs";
     BuiltInTemplateName["schemaJson"] = "schemaJson";
+    // types
+    BuiltInTemplateName["standaloneTypesTs"] = "standaloneTypesTs";
     // misc
     BuiltInTemplateName["readme"] = "readme";
     BuiltInTemplateName["packageJson"] = "packageJson";
@@ -30,12 +32,6 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjs}/`,
             requires: { [BuiltInTemplateName.schemaCjs]: '.' },
         },
-        [BuiltInTemplateName.readme]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.readme}/`,
-        },
-        [BuiltInTemplateName.packageJson]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.packageJson}/`,
-        },
         [BuiltInTemplateName.schemaTs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaTs}/`,
         },
@@ -45,13 +41,23 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.schemaJson]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaJson}/`,
         },
+        [BuiltInTemplateName.standaloneTypesTs]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.standaloneTypesTs}/`,
+            requires: { [BuiltInTemplateName.schemaJson]: '.' },
+        },
+        [BuiltInTemplateName.readme]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.readme}/`,
+        },
+        [BuiltInTemplateName.packageJson]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.packageJson}/`,
+        },
         [BuiltInTemplateName.rs]: {
             templatePath: 'vovk-rust-client/template/',
             composedClient: {
                 outDir: 'dist_rust',
             },
             requires: {
-                schemaJson: './data',
+                [BuiltInTemplateName.schemaJson]: './data',
             },
         },
         [BuiltInTemplateName.py]: {
@@ -60,7 +66,7 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
                 outDir: 'dist_python',
             },
             requires: {
-                schemaJson: './data',
+                [BuiltInTemplateName.schemaJson]: './data',
             },
         },
     };

package/dist/getProjectInfo/index.d.mts

@@ -8,7 +8,7 @@ export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRo
     cwd: string;
     port: string;
     apiRoot: string;
-    apiDir: string;
+    apiDirAbsolutePath: string | null;
     srcRoot: string | null;
     config: import("vovk").VovkStrictConfig;
     log: {

package/dist/getProjectInfo/index.mjs

@@ -12,7 +12,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
         throw new Error(`Could not find app router directory at ${cwd}. Check Next.js docs for more info.`);
     }
     const apiRoot = `${config.origin ?? ''}/${config.rootEntry}`;
-    const apiDir = path.join(srcRoot ?? '.', 'app', config.rootEntry);
+    const apiDirAbsolutePath = srcRoot ? path.resolve(cwd, srcRoot, 'app', config.rootEntry) : null;
     if (configAbsolutePaths.length > 1) {
         log.warn(`Multiple config files found. Using the first one: ${configAbsolutePaths[0]}`);
     }
@@ -20,7 +20,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
         cwd,
         port,
         apiRoot,
-        apiDir,
+        apiDirAbsolutePath,
         srcRoot,
         config,
         log,

package/dist/index.mjs

@@ -88,6 +88,7 @@ program
     .option('--prettify', 'prettify output files')
     .option('--schema, --schema-path <path>', 'path to schema folder (default: ./.vovk-schema)')
     .option('--config, --config-path <config>', 'path to config file')
+    .option('--force-ts-standalone', 'force TypeScript standalone mode (Next.js environment will be ignored, by default it\'s "true" for non-Next.js directories)')
     .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL')
     .option('--openapi, --openapi-spec <openapi_path_or_url>', 'use OpenAPI schema instead of Vovk schema')
     .action(async (cliGenerateOptions) => {

package/dist/locateSegments.d.mts

@@ -5,7 +5,7 @@ export type Segment = {
     segmentName: string;
 };
 export declare function locateSegments({ dir, rootDir, config, log, }: {
-    dir: string;
+    dir: string | null;
     rootDir?: string;
     config: VovkStrictConfig | null;
     log: ProjectInfo['log'];

package/dist/locateSegments.mjs

@@ -3,6 +3,8 @@ import path from 'node:path';
 import getFileSystemEntryType from './utils/getFileSystemEntryType.mjs';
 export async function locateSegments({ dir, rootDir, config, log, }) {
     let results = [];
+    if (!dir)
+        return results; // If dir is null, return empty results because this isn't a Next.js app
     rootDir = rootDir ?? dir;
     let list = [];
     // Read the contents of the directory

package/dist/new/newModule.mjs

@@ -21,8 +21,8 @@ function splitByLast(str, delimiter = '/') {
     return [before, after];
 }
 export default async function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }) {
-    const { config, log, cwd, apiDir } = await getProjectInfo();
-    const segments = await locateSegments({ dir: path.join(cwd, apiDir), config, log });
+    const { config, log, cwd, apiDirAbsolutePath } = await getProjectInfo();
+    const segments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
     let templates = config.moduleTemplates;
     const [segmentName, moduleName] = splitByLast(moduleNameWithOptionalSegment);

package/dist/new/newSegment.mjs

@@ -7,8 +7,11 @@ import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import prettify from '../utils/prettify.mjs';
 import chalk from 'chalk';
 export default async function newSegment({ segmentName, isStaticSegment, overwrite, dryRun, }) {
-    const { apiDir, cwd, log, config } = await getProjectInfo();
-    const absoluteSegmentRoutePath = path.join(cwd, apiDir, segmentName, '[[...vovk]]/route.ts');
+    const { apiDirAbsolutePath, log, config } = await getProjectInfo();
+    if (!apiDirAbsolutePath) {
+        throw new Error('No API directory found. Please ensure you are in a Nest.js project.');
+    }
+    const absoluteSegmentRoutePath = path.join(apiDirAbsolutePath, segmentName, '[[...vovk]]/route.ts');
     if (!overwrite && (await getFileSystemEntryType(absoluteSegmentRoutePath))) {
         throw new Error(`Unable to create new segment. ${formatLoggedSegmentName(segmentName, { upperFirst: true })} already exists.`);
     }

package/dist/types.d.mts

@@ -18,6 +18,7 @@ export interface GenerateOptions {
     schemaPath?: string;
     openapiSpec?: string;
     watch?: boolean | string;
+    forceTsStandalone?: boolean;
     composedFrom?: string[];
     composedOut?: string;
     composedOnly?: boolean;

package/dist/utils/convertJSONSchemaToTypeScriptDef.d.mts

@@ -0,0 +1,2 @@
+import { JSONSchema7 } from 'json-schema';
+export declare function convertJSONSchemaToTypeScriptDef(schema: JSONSchema7): string | null;

package/dist/utils/convertJSONSchemaToTypeScriptDef.mjs

@@ -0,0 +1,150 @@
+export function convertJSONSchemaToTypeScriptDef(schema) {
+    if (!schema)
+        return null;
+    // Helper function to get JSDoc from schema
+    const getJSDoc = (schema, indentation = '') => {
+        if (typeof schema === 'boolean') {
+            return `${indentation}/**\n${indentation} * none\n${indentation} */`;
+        }
+        const description = schema.description || schema.title || 'none';
+        return `${indentation}/**\n${indentation} * ${description}\n${indentation} */`;
+    };
+    // Helper function to convert schema to TypeScript type
+    const schemaToType = (schema, indentation = '  ') => {
+        if (typeof schema === 'boolean') {
+            return schema ? 'KnownAny' : 'never';
+        }
+        if (schema.enum) {
+            return schema.enum
+                .map((value) => {
+                if (typeof value === 'string') {
+                    return `'${value}'`;
+                }
+                else if (value === null) {
+                    return 'null';
+                }
+                else {
+                    return String(value);
+                }
+            })
+                .join(' | ');
+        }
+        if (schema.const !== undefined) {
+            if (typeof schema.const === 'string') {
+                return `'${schema.const}'`;
+            }
+            else if (schema.const === null) {
+                return 'null';
+            }
+            else {
+                return String(schema.const);
+            }
+        }
+        if (schema.oneOf) {
+            return schema.oneOf.map((s) => schemaToType(s, indentation)).join(' | ');
+        }
+        if (schema.anyOf) {
+            return schema.anyOf.map((s) => schemaToType(s, indentation)).join(' | ');
+        }
+        if (schema.allOf) {
+            return schema.allOf.map((s) => schemaToType(s, indentation)).join(' & ');
+        }
+        if (schema.type === 'object' || schema.properties) {
+            const properties = schema.properties || {};
+            const required = schema.required || [];
+            const propertyEntries = Object.entries(properties);
+            if (propertyEntries.length === 0) {
+                // Handle additional properties
+                if (schema.additionalProperties) {
+                    if (typeof schema.additionalProperties === 'boolean') {
+                        return schema.additionalProperties ? 'Record<string, KnownAny>' : '{}';
+                    }
+                    else {
+                        const valueType = schemaToType(schema.additionalProperties, indentation);
+                        return `Record<string, ${valueType}>`;
+                    }
+                }
+                return '{}';
+            }
+            const props = propertyEntries
+                .map(([propName, propSchema]) => {
+                if (typeof propSchema === 'boolean') {
+                    const type = propSchema ? 'KnownAny' : 'never';
+                    const isOptional = !required.includes(propName);
+                    const jsDoc = getJSDoc(propSchema, indentation);
+                    return `${jsDoc}\n${indentation}${propName}${isOptional ? '?' : ''}: ${type};`;
+                }
+                const isOptional = !required.includes(propName);
+                const defaultValue = propSchema.default !== undefined ? ` // default: ${JSON.stringify(propSchema.default)}` : '';
+                const jsDoc = getJSDoc(propSchema, indentation);
+                const propType = schemaToType(propSchema, indentation + '  ');
+                return `${jsDoc}\n${indentation}${propName}${isOptional ? '?' : ''}: ${propType};${defaultValue}`;
+            })
+                .join('\n');
+            // Handle additional properties
+            let additionalPropsType = '';
+            if (schema.additionalProperties) {
+                if (typeof schema.additionalProperties === 'boolean') {
+                    if (schema.additionalProperties) {
+                        additionalPropsType = `\n${indentation}[key: string]: KnownAny;`;
+                    }
+                }
+                else {
+                    const valueType = schemaToType(schema.additionalProperties, indentation + '  ');
+                    additionalPropsType = `\n${indentation}[key: string]: ${valueType};`;
+                }
+            }
+            return `{\n${props}${additionalPropsType}\n${indentation.slice(2)}}`;
+        }
+        if (schema.type === 'array' && schema.items) {
+            if (Array.isArray(schema.items)) {
+                // Tuple
+                const tupleTypes = schema.items.map((item) => schemaToType(item, indentation));
+                let tupleType = `[${tupleTypes.join(', ')}]`;
+                // Handle additional items
+                if (schema.additionalItems === true) {
+                    tupleType += ' & KnownAny[]';
+                }
+                else if (typeof schema.additionalItems === 'object') {
+                    const additionalType = schemaToType(schema.additionalItems, indentation);
+                    tupleType += ` & ${additionalType}[]`;
+                }
+                return tupleType;
+            }
+            else {
+                // Array
+                return `${schemaToType(schema.items, indentation)}[]`;
+            }
+        }
+        // Handle multiple types
+        if (Array.isArray(schema.type)) {
+            return schema.type
+                .map((t) => {
+                const singleTypeSchema = { ...schema, type: t };
+                singleTypeSchema.type = t;
+                return schemaToType(singleTypeSchema, indentation);
+            })
+                .join(' | ');
+        }
+        // Handle primitive types
+        switch (schema.type) {
+            case 'string':
+                return 'string';
+            case 'number':
+            case 'integer':
+                return 'number';
+            case 'boolean':
+                return 'boolean';
+            case 'null':
+                return 'null';
+            case 'array':
+                return 'KnownAny[]'; // For arrays with no items defined
+            default:
+                return 'KnownAny';
+        }
+    };
+    // Generate the interface
+    const jsDoc = getJSDoc(schema);
+    const interfaceBody = schemaToType(schema);
+    return `${jsDoc}\n${interfaceBody}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.202",
+  "version": "0.0.1-draft.203",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.180"
+    "vovk": "^3.0.0-draft.181"
   },
   "optionalDependencies": {
     "vovk-python-client": "^0.0.1-draft.37"
@@ -48,6 +48,7 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.2",
+    "@types/json-schema": "^7.0.15",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",