vovk-cli 0.0.1-draft.333 → 0.0.1-draft.335

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

@@ -1,7 +1,9 @@
 import { VovkSchemaIdEnum, type VovkStrictConfig } from 'vovk';
-export default function getConfig({ configPath, cwd }: {
+import type { LogLevelNames } from 'loglevel';
+export default function getConfig({ configPath, cwd, logLevel, }: {
     configPath?: string;
     cwd: string;
+    logLevel?: LogLevelNames;
 }): Promise<{
     config: VovkStrictConfig;
     srcRoot: string | null;
@@ -12,14 +14,13 @@ export default function getConfig({ configPath, cwd }: {
         schemaOutDir?: string;
         modulesDir?: string;
         rootEntry?: string;
-        origin?: string;
         logLevel?: "error" | "trace" | "debug" | "info" | "warn" | (string & {});
         libs?: {
             ajv: import("vovk").KnownAny;
             [key: string]: import("vovk").KnownAny;
         };
         devHttps?: boolean;
-        composedClient?: ({
+        composedClient?: {
             enabled?: boolean;
             outDir?: string;
             fromTemplates?: string[];
@@ -30,13 +31,8 @@ export default function getConfig({ configPath, cwd }: {
         } | {
             excludeSegments?: string[];
             includeSegments?: never;
-        })) & {
-            package?: import("type-fest").PackageJson;
-            readme?: {
-                banner?: string;
-            };
-        };
-        segmentedClient?: ({
+        });
+        segmentedClient?: {
             enabled?: boolean;
             outDir?: string;
             fromTemplates?: string[];
@@ -47,22 +43,11 @@ export default function getConfig({ configPath, cwd }: {
         } | {
             excludeSegments?: string[];
             includeSegments?: never;
-        })) & {
-            packages?: Record<string, import("type-fest").PackageJson>;
-            readmes?: Record<string, {
-                banner?: string;
-            }>;
-        };
+        });
         bundle?: {
             requires?: Record<string, string>;
             prebundleOutDir?: string;
             keepPrebundleDir?: boolean;
-            origin?: string;
-            package?: import("type-fest").PackageJson;
-            readme?: {
-                banner?: string;
-            };
-            reExports?: Record<string, string>;
             tsdownBuildOptions?: Parameters<typeof import("tsdown/config-9hj-APNF.mjs").build>[0];
         } & ({
             excludeSegments?: never;
@@ -71,7 +56,7 @@ export default function getConfig({ configPath, cwd }: {
             excludeSegments?: string[];
             includeSegments?: never;
         });
-        clientTemplateDefs?: Record<string, import("vovk/mjs/types").ClientTemplateDef>;
+        clientTemplateDefs?: Record<string, import("vovk/types").ClientTemplateDef>;
         imports?: {
             fetcher?: string | [string, string] | [string];
             validateOnClient?: string | [string, string] | [string];
@@ -83,34 +68,7 @@ export default function getConfig({ configPath, cwd }: {
             controller?: string;
             [key: string]: string | undefined;
         };
-        segmentConfig?: false | {
-            [x: string]: {
-                origin?: string;
-                rootEntry?: string;
-                segmentNameOverride?: string;
-                reExports?: Record<string, string>;
-            };
-        };
-        openApiMixins?: {
-            [mixinName: string]: {
-                source: {
-                    file: string;
-                } | {
-                    url: string;
-                    fallback?: string;
-                } | {
-                    object: import("openapi3-ts/oas31").OpenAPIObject;
-                };
-                package?: import("type-fest").PackageJson;
-                readme?: {
-                    banner?: string;
-                };
-                apiRoot?: string;
-                getModuleName?: "nestjs-operation-id" | (string & {}) | "api" | import("vovk/mjs/types").GetOpenAPINameFn;
-                getMethodName?: "nestjs-operation-id" | "camel-case-operation-id" | "auto" | import("vovk/mjs/types").GetOpenAPINameFn;
-                errorMessageKey?: string;
-            };
-        };
+        projectConfig?: import("vovk").VovkProjectConfig;
     } | null;
     log: {
         info: (msg: string) => void;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -4,14 +4,15 @@ import getLogger from '../../utils/getLogger.mjs';
 import getUserConfig from './getUserConfig.mjs';
 import getRelativeSrcRoot from './getRelativeSrcRoot.mjs';
 import getTemplateDefs, { BuiltInTemplateName } from './getTemplateDefs.mjs';
-import { normalizeOpenAPIMixins } from '../../utils/normalizeOpenAPIMixins.mjs';
+import { normalizeOpenAPIMixin } from '../../utils/normalizeOpenAPIMixin.mjs';
 import chalkHighlightThing from '../../utils/chalkHighlightThing.mjs';
-export default async function getConfig({ configPath, cwd }) {
+export default async function getConfig({ configPath, cwd, logLevel, }) {
     const { configAbsolutePaths, error, userConfig } = await getUserConfig({
         configPath,
         cwd,
     });
     const conf = userConfig ?? {};
+    const log = getLogger(logLevel ?? conf.logLevel);
     const env = process.env;
     const clientTemplateDefs = getTemplateDefs(conf.clientTemplateDefs);
     const srcRoot = await getRelativeSrcRoot({ cwd });
@@ -51,9 +52,6 @@ export default async function getConfig({ configPath, cwd }) {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
             },
-            package: {},
-            readme: {},
-            reExports: {},
             ...conf.bundle,
             tsdownBuildOptions: {
                 outDir: conf.bundle?.tsdownBuildOptions?.outDir ?? 'dist',
@@ -62,10 +60,9 @@ export default async function getConfig({ configPath, cwd }) {
         },
         modulesDir: conf.modulesDir ?? path.join(srcRoot ?? '.', 'modules'),
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',
-        origin: (env.VOVK_ORIGIN ?? conf.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
         rootEntry: env.VOVK_ROOT_ENTRY ?? conf.rootEntry ?? 'api',
         rootSegmentModulesDirName: conf.rootSegmentModulesDirName ?? '',
-        logLevel: env.VOVK_LOG_LEVEL ?? conf.logLevel ?? 'info',
+        logLevel: conf.logLevel ?? 'info',
         devHttps: conf.devHttps ?? false,
         moduleTemplates: {
             service: 'vovk-cli/module-templates/service.ts.ejs',
@@ -73,11 +70,22 @@ export default async function getConfig({ configPath, cwd }) {
             ...conf.moduleTemplates,
         },
         libs: conf.libs ?? {},
-        segmentConfig: conf.segmentConfig ?? {},
-        openApiMixins: {},
+        projectConfig: {
+            ...conf.projectConfig,
+            origin: (env.VOVK_ORIGIN ?? conf?.projectConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
+            segments: Object.fromEntries(await Promise.all(Object.entries(conf.projectConfig?.segments ?? {}).map(async ([key, value]) => [
+                key,
+                {
+                    ...value,
+                    openAPIMixin: value.openAPIMixin
+                        ? await normalizeOpenAPIMixin({ mixinModule: value.openAPIMixin, log, cwd })
+                        : undefined,
+                },
+            ]))),
+        },
     };
     if (typeof conf.emitConfig === 'undefined') {
-        config.emitConfig = ['libs'];
+        config.emitConfig = ['libs', 'projectConfig'];
     }
     else if (conf.emitConfig === true) {
         config.emitConfig = Object.keys(config);
@@ -85,12 +93,6 @@ export default async function getConfig({ configPath, cwd }) {
     else if (Array.isArray(conf.emitConfig)) {
         config.emitConfig = conf.emitConfig;
     } // else it's false and emitConfig already is []
-    const log = getLogger(config.logLevel);
-    config.openApiMixins = await normalizeOpenAPIMixins({
-        mixinModules: conf.openApiMixins ?? {},
-        cwd,
-        log,
-    });
     if (!userConfig) {
         log.warn(`Unable to load config at ${chalkHighlightThing(cwd)}. Using default values. ${error ?? ''}`);
     }

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -0,0 +1,10 @@
+import { VovkSchemaIdEnum, VovkStrictConfig } from 'vovk';
+import { PackageJson } from 'type-fest';
+export default function getMetaSchema({ config, package: packageJson, }: {
+    config: VovkStrictConfig;
+    package: PackageJson;
+}): {
+    config: VovkStrictConfig;
+    $schema: VovkSchemaIdEnum;
+    package: Pick<PackageJson, "name" | "version" | "description" | "author" | "license">;
+};

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -0,0 +1,13 @@
+import { VovkSchemaIdEnum } from 'vovk';
+import pick from 'lodash/pick.js';
+export default function getMetaSchema({ config, package: packageJson, }) {
+    return {
+        $schema: VovkSchemaIdEnum.META,
+        package: pick(packageJson, ['name', 'version', 'description', 'author', 'license']),
+        ...{
+            config: (config
+                ? pick(config, [...config.emitConfig, '$schema'])
+                : {}),
+        },
+    };
+}

package/dist/getProjectInfo/index.d.mts

@@ -1,9 +1,11 @@
+import { LogLevelNames } from 'loglevel';
 export type ProjectInfo = Awaited<ReturnType<typeof getProjectInfo>>;
-export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRootRequired, }?: {
+export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRootRequired, logLevel, }?: {
     port?: number;
     cwd?: string;
     configPath?: string;
     srcRootRequired?: boolean;
+    logLevel?: LogLevelNames;
 }): Promise<{
     cwd: string;
     port: string;
@@ -13,7 +15,7 @@ export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRo
     vovkCliPackage: {
         version: string;
     };
-    config: import("vovk").VovkStrictConfig;
+    config: import("vovk/types").VovkStrictConfig;
     packageJson: import("type-fest").PackageJson;
     isNextInstalled: boolean;
     log: {

package/dist/getProjectInfo/index.mjs

@@ -2,20 +2,23 @@ import path from 'node:path';
 import getConfig from './getConfig/index.mjs';
 import { getPackageJson } from '../utils/getPackageJson.mjs';
 import { readFile } from 'node:fs/promises';
-export default async function getProjectInfo({ port: givenPort, cwd = process.cwd(), configPath, srcRootRequired = true, } = {}) {
+export default async function getProjectInfo({ port: givenPort, cwd = process.cwd(), configPath, srcRootRequired = true, logLevel, } = {
+    logLevel: 'info',
+}) {
     const port = givenPort?.toString() ?? process.env.PORT ?? '3000';
     // Make PORT available to the config file at getConfig
     process.env.PORT = port;
     const { config, srcRoot, configAbsolutePaths, log } = await getConfig({
         configPath,
         cwd,
+        logLevel,
     });
     const packageJson = await getPackageJson(cwd, log);
     const isNextInstalled = !!packageJson?.dependencies?.next || !!packageJson?.devDependencies?.next;
     if (srcRootRequired && !srcRoot) {
         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 apiRoot = `${config.projectConfig.origin ?? ''}/${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]}`);

package/dist/index.mjs

@@ -25,8 +25,9 @@ program
     .option('--exit', 'kill the processes when schema and client is generated')
     .option('--schema-out <path>', 'path to schema output directory (default: .vovk-schema)')
     .option('--https, --dev-https', 'use HTTPS for the dev server (default: false)')
+    .option('--log-level <level>', 'set the log level')
     .action(async (nextArgs, options) => {
-    const { nextDev, exit = false, schemaOut, devHttps } = options;
+    const { nextDev, exit = false, schemaOut, devHttps, logLevel } = options;
     const portAttempts = 30;
     const PORT = !nextDev
         ? process.env.PORT
@@ -52,9 +53,11 @@ program
                 env: {
                     PORT,
                     __VOVK_START_WATCHER_IN_STANDALONE_MODE__: 'true',
+                    // TODO: Pass these as flags
                     __VOVK_SCHEMA_OUT_FLAG__: schemaOut ?? '',
                     __VOVK_DEV_HTTPS_FLAG__: devHttps ? 'true' : 'false',
                     __VOVK_EXIT__: exit ? 'true' : 'false',
+                    __VOVK_LOG_LEVEL__: logLevel ?? undefined,
                 },
             },
         ], {
@@ -70,7 +73,7 @@ program
         }
     }
     else {
-        void new VovkDev({ schemaOut, devHttps }).start({ exit });
+        void new VovkDev({ schemaOut, devHttps, logLevel }).start({ exit });
     }
 });
 program
@@ -98,8 +101,13 @@ program
     .option('--openapi-root-url <urls...>', 'root URLs corresponding to the index of --openapi option')
     .option('--openapi-mixin-name <names...>', 'mixin names corresponding to the index of --openapi option')
     .option('--openapi-fallback <paths...>', 'save OpenAPI spec and use it as a fallback if URL is not available')
+    .option('--log-level <level>', 'set the log level')
     .action(async (cliGenerateOptions) => {
-    const projectInfo = await getProjectInfo({ configPath: cliGenerateOptions.configPath, srcRootRequired: false });
+    const projectInfo = await getProjectInfo({
+        configPath: cliGenerateOptions.configPath,
+        srcRootRequired: false,
+        logLevel: cliGenerateOptions.logLevel,
+    });
     await new VovkGenerate({
         projectInfo,
         forceNothingWrittenLog: true,
@@ -118,17 +126,25 @@ program
     .option('--config <config>', 'path to config file')
     .option('--schema <path>', 'path to schema folder (default: .vovk-schema)')
     .option('--origin <url>', 'set the origin URL for the generated client')
+    .option('--tsconfig <path>', 'path to tsconfig.json for bundling by tsdown')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema instead of Vovk schema')
     .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
     .option('--openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')
     .option('--openapi-root-url <urls...>', 'root URLs corresponding to the index of --openapi option')
+    .option('--log-level <level>', 'set the log level')
     .action(async (cliBundleOptions) => {
-    const projectInfo = await getProjectInfo({ configPath: cliBundleOptions.config, srcRootRequired: false });
-    const { cwd, config, log, isNextInstalled } = projectInfo;
+    const projectInfo = await getProjectInfo({
+        configPath: cliBundleOptions.config,
+        srcRootRequired: false,
+        logLevel: cliBundleOptions.logLevel,
+    });
+    const { cwd, config, log, isNextInstalled, packageJson } = projectInfo;
     const fullSchema = await getProjectFullSchema({
         schemaOutAbsolutePath: path.resolve(cwd, cliBundleOptions?.schema ?? config.schemaOutDir),
         log,
         isNextInstalled,
+        package: packageJson,
+        config,
     });
     await bundle({
         projectInfo,
@@ -147,7 +163,10 @@ program
     .option('--no-segment-update', 'do not update segment files when creating a new module')
     .option('--dry-run', 'do not write files to disk')
     .option('--static', 'if the segment is static')
-    .action((components, newOptions) => newComponents(components, newOptions));
+    .option('--log-level <level>', 'set the log level')
+    .action(async (components, newOptions) => newComponents(components, await getProjectInfo({
+    logLevel: newOptions.logLevel,
+}), newOptions));
 program
     .command('help')
     .description('Show help message')

package/dist/init/createConfig.mjs

@@ -11,14 +11,36 @@ export default async function createConfig({ root, log, options: { validationLib
         .readFile(path.join(root, 'package.json'), 'utf-8')
         .then((content) => JSON.parse(content).type === 'module');
     const configAbsolutePath = path.join(dir, isModule ? 'vovk.config.mjs' : 'vovk.config.js');
+    const typeTemplates = {
+        controller: 'vovk-cli/module-templates/type/controller.ts.ejs',
+        service: 'vovk-cli/module-templates/type/service.ts.ejs',
+    };
     const moduleTemplates = {
-        controller: 'vovk-cli/module-templates/controller.ts.ejs',
-        service: 'vovk-cli/module-templates/service.ts.ejs',
+        ...typeTemplates,
+        ...{
+            type: typeTemplates,
+            zod: {
+                controller: 'vovk-zod/module-templates/controller.ts.ejs',
+            },
+            yup: {
+                controller: 'vovk-yup/module-templates/controller.ts.ejs',
+            },
+            'class-validator': {
+                controller: 'vovk-dto/module-templates/controller.ts.ejs',
+            },
+            valibot: {
+                controller: 'vovk-cli/module-templates/valibot/controller.ts.ejs',
+            },
+            arktype: {
+                controller: 'vovk-cli/module-templates/arktype/controller.ts.ejs',
+            },
+        }[validationLibrary ?? 'type'],
     };
     config.imports ??= {};
-    config.imports.validateOnClient = validationLibrary === 'vovk-dto' ? 'vovk-dto/validateOnClient' : 'vovk-ajv';
-    if (validationLibrary) {
+    config.imports.validateOnClient = validationLibrary === 'class-validator' ? 'vovk-dto/validateOnClient' : 'vovk-ajv';
+    if (validationLibrary && !moduleTemplates) {
         try {
+            // TODO: Legacy, is it useful to keep it?
             const validationTemplates = await getTemplateFilesFromPackage(validationLibrary, channel);
             Object.assign(moduleTemplates, validationTemplates);
         }

package/dist/init/createStandardSchemaValidatorFile.d.mts

@@ -0,0 +1,4 @@
+export declare function createStandardSchemaValidatorFile({ cwd, validationLibrary, }: {
+    cwd: string;
+    validationLibrary: 'arktype' | 'valibot';
+}): Promise<void>;

package/dist/init/createStandardSchemaValidatorFile.mjs

@@ -0,0 +1,38 @@
+import fs from 'fs/promises';
+import getRelativeSrcRoot from '../getProjectInfo/getConfig/getRelativeSrcRoot.mjs';
+import path from 'path';
+function getCode(validationLibrary) {
+    if (validationLibrary === 'valibot') {
+        return `
+import { createStandardValidation, KnownAny } from 'vovk';
+import { toJsonSchema } from '@valibot/to-json-schema';
+import * as v from 'valibot';
+
+const withValibot = createStandardValidation({
+  toJSONSchema: (model: v.BaseSchema<KnownAny, KnownAny, KnownAny>) => toJsonSchema(model),
+});
+
+export default withValibot;
+`.trimStart();
+    }
+    if (validationLibrary === 'arktype') {
+        return `
+import { createStandardValidation } from 'vovk';
+import { type } from 'arktype';
+
+const withArk = createStandardValidation({
+  toJSONSchema: (model: type) => model.toJsonSchema(),
+});
+
+export default withArk;
+`.trimStart();
+    }
+    throw new Error(`Unknown validation library: ${validationLibrary}`);
+}
+export async function createStandardSchemaValidatorFile({ cwd, validationLibrary, }) {
+    const code = getCode(validationLibrary);
+    const srcRoot = (await getRelativeSrcRoot({ cwd })) ?? '.';
+    const libDir = path.join(cwd, srcRoot, 'lib');
+    await fs.mkdir(libDir, { recursive: true });
+    await fs.writeFile(path.join(libDir, `${validationLibrary === 'arktype' ? 'withArk' : 'withValibot'}.ts`), code);
+}

package/dist/init/index.mjs

@@ -8,18 +8,19 @@ import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 import installDependencies, { getPackageManager } from './installDependencies.mjs';
 import getLogger from '../utils/getLogger.mjs';
 import createConfig from './createConfig.mjs';
-import updateNPMScripts, { getBuildScript, getDevScript } from './updateNPMScripts.mjs';
+import updateNPMScripts, { getDevScript } from './updateNPMScripts.mjs';
 import checkTSConfigForExperimentalDecorators from './checkTSConfigForExperimentalDecorators.mjs';
 import updateTypeScriptConfig from './updateTypeScriptConfig.mjs';
 import updateDependenciesWithoutInstalling from './updateDependenciesWithoutInstalling.mjs';
 import logUpdateDependenciesError from './logUpdateDependenciesError.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
+import { createStandardSchemaValidatorFile } from './createStandardSchemaValidatorFile.mjs';
 export class Init {
     root;
     log;
-    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
+    async #init({ configPaths, pkgJson, cwd = process.cwd(), }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk', 'vovk-client', 'vovk-ajv', 'openapi3-ts'];
+        const dependencies = ['vovk', 'vovk-client', 'openapi3-ts', 'vovk-ajv', 'ajv'];
         const devDependencies = ['vovk-cli'];
         if (lang?.includes('py')) {
             devDependencies.push('vovk-python');
@@ -33,9 +34,18 @@ export class Init {
             log.debug(`Deleted existing config file${configPaths.length > 1 ? 's' : ''} at ${configPaths.join(', ')}`);
         }
         if (validationLibrary) {
-            dependencies.push(validationLibrary, ...({
-                'vovk-zod': ['zod'],
-                'vovk-dto': ['class-validator', 'class-transformer', 'dto-mapped-types', 'reflect-metadata'],
+            dependencies.push(...({
+                zod: ['zod', 'vovk-zod'],
+                'class-validator': [
+                    'class-validator',
+                    'class-transformer',
+                    'dto-mapped-types',
+                    'reflect-metadata',
+                    'vovk-dto',
+                ],
+                yup: ['yup', 'vovk-yup'],
+                valibot: ['valibot', '@valibot/to-json-schema'],
+                arktype: ['arktype'],
             }[validationLibrary] ?? []));
         }
         if (updateScripts) {
@@ -56,7 +66,7 @@ export class Init {
                 const compilerOptions = {
                     experimentalDecorators: true,
                 };
-                if (validationLibrary === 'vovk-dto') {
+                if (validationLibrary === 'class-validator') {
                     compilerOptions.emitDecoratorMetadata = true;
                 }
                 if (!dryRun)
@@ -120,6 +130,12 @@ export class Init {
                 }
             }
         }
+        if (validationLibrary === 'valibot' || validationLibrary === 'arktype') {
+            createStandardSchemaValidatorFile({
+                cwd,
+                validationLibrary,
+            });
+        }
         try {
             const { configAbsolutePath } = await createConfig({
                 root,
@@ -135,13 +151,13 @@ export class Init {
     async main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix ?? '.');
-        const log = getLogger(logLevel);
+        const log = getLogger(logLevel ?? 'info');
         const pkgJson = await NPMCliPackageJson.load(root);
         this.root = root;
         this.log = log;
         const configPaths = await getConfigPaths({ cwd, relativePath: prefix });
         if (yes) {
-            return this.#init({ configPaths, pkgJson }, {
+            return this.#init({ configPaths, pkgJson, cwd }, {
                 prefix: prefix ?? '.',
                 useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
                 useYarn: useYarn ?? false,
@@ -150,7 +166,7 @@ export class Init {
                 skipInstall: skipInstall ?? false,
                 updateTsConfig: updateTsConfig ?? true,
                 updateScripts: updateScripts ?? 'implicit',
-                validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'vovk-zod'),
+                validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'zod'),
                 dryRun: dryRun ?? false,
                 channel: channel ?? 'latest',
                 lang: lang ?? [],
@@ -174,17 +190,27 @@ export class Init {
                 : (validationLibrary ??
                     (await select({
                         message: 'Choose validation library',
-                        default: 'vovk-zod',
+                        default: 'zod',
                         choices: [
                             {
-                                name: 'vovk-zod',
-                                value: 'vovk-zod',
+                                name: 'Zod',
+                                value: 'zod',
                                 description: 'Use Zod for data validation',
                             },
                             {
-                                name: 'vovk-dto',
-                                value: 'vovk-dto',
-                                description: 'Use class-validator for data validation. Also installs class-transformer, dto-mapped-types and reflect-metadata',
+                                name: 'class-validator',
+                                value: 'class-validator',
+                                description: 'Use class-validator for data validation',
+                            },
+                            {
+                                name: 'Valibot',
+                                value: 'valibot',
+                                description: 'Use valibot for data validation.',
+                            },
+                            {
+                                name: 'ArkType',
+                                value: 'arktype',
+                                description: 'Use arktype for data validation.',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
@@ -196,12 +222,12 @@ export class Init {
                 {
                     name: 'Yes, use "concurrently" implicitly',
                     value: 'implicit',
-                    description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)} and the "build" scrilt will run "vovk generate" before "next build" ${chalk.whiteBright.bold(`"${getBuildScript(pkgJson)}"`)}`,
+                    description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)} and the "prebuild" script will run "vovk generate"`,
                 },
                 {
                     name: 'Yes, use "concurrently" explicitly',
                     value: 'explicit',
-                    description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)} and the "build" scrilt will run "vovk generate" before "next build" ${chalk.whiteBright.bold(`"${getBuildScript(pkgJson)}"`)}`,
+                    description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)} and the "prebuild" script will run "vovk generate"`,
                 },
                 {
                     name: 'No',
@@ -220,7 +246,7 @@ export class Init {
             }
             if (shouldAsk) {
                 const keys = ['experimentalDecorators'];
-                if (validationLibrary === 'vovk-dto') {
+                if (validationLibrary === 'class-validator') {
                     keys.push('emitDecoratorMetadata');
                 }
                 updateTsConfig = await confirm({
@@ -229,13 +255,13 @@ export class Init {
             }
         }
         lang ??= await checkbox({
-            message: 'Do you want to generate RPC client for other languages besides TypeScript (beta)?',
+            message: 'Do you want to generate RPC client for other languages besides TypeScript (experimental)?',
             choices: [
                 { name: 'Python', value: 'py' },
                 { name: 'Rust', value: 'rs' },
             ],
         });
-        await this.#init({ configPaths, pkgJson }, {
+        await this.#init({ configPaths, pkgJson, cwd }, {
             useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
             useYarn: useYarn ?? false,
             usePnpm: usePnpm ?? false,

package/dist/init/updateNPMScripts.d.mts

@@ -1,4 +1,3 @@
 import NPMCliPackageJson from '@npmcli/package-json';
 export declare function getDevScript(pkgJson: NPMCliPackageJson, updateScriptsMode: 'implicit' | 'explicit'): string;
-export declare function getBuildScript(pkgJson: NPMCliPackageJson): string;
 export default function updateNPMScripts(pkgJson: NPMCliPackageJson, root: string, updateScriptsMode: 'implicit' | 'explicit'): Promise<void>;

package/dist/init/updateNPMScripts.mjs

@@ -5,16 +5,12 @@ export function getDevScript(pkgJson, updateScriptsMode) {
         ? `PORT=3000 concurrently '${nextDev}' 'vovk dev' --kill-others`
         : `vovk dev --next-dev${nextDevFlags ? ` -- ${nextDevFlags}` : ''}`;
 }
-export function getBuildScript(pkgJson) {
-    const nextBuild = pkgJson.content.scripts?.build ?? 'next build';
-    return `vovk generate && ${nextBuild}`;
-}
 export default async function updateNPMScripts(pkgJson, root, updateScriptsMode) {
     pkgJson.update({
         scripts: {
             ...pkgJson.content.scripts,
             dev: getDevScript(pkgJson, updateScriptsMode),
-            build: getBuildScript(pkgJson),
+            prebuild: 'vovk generate',
         },
     });
     await pkgJson.save();

package/dist/initProgram.mjs

@@ -14,7 +14,7 @@ export function initProgram(program) {
         .option('--update-ts-config', 'update tsconfig.json')
         .option('--update-scripts <mode>', 'update package.json scripts ("implicit" or "explicit")')
         .option('--lang <languages...>', 'generate client for other programming languages by default ("py" for Python and "rs" for Rust are supported)')
-        .option('--validation-library <library>', 'validation library to use ("vovk-zod", "vovk-dto" or another); set to "none" to skip')
+        .option('--validation-library <library>', 'validation library to use ("zod", "class-validator", "valibot", "arktype" or another); set to "none" to skip')
         .option('--channel <channel>', 'channel to use for fetching packages', 'latest')
         .option('--dry-run', 'do not write files to disk')
         .action((options) => new Init().main(options));

package/dist/new/index.d.mts

@@ -1,2 +1,3 @@
 import type { NewOptions } from '../types.mjs';
-export declare function newComponents(components: string[], { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }: NewOptions): Promise<void>;
+import type { ProjectInfo } from '../getProjectInfo/index.mts';
+export declare function newComponents(components: string[], projectInfo: ProjectInfo, { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }: NewOptions): Promise<void>;