vovk-cli 0.0.1-draft.380 → 0.0.1-draft.382

package/README.md

@@ -1,29 +1,31 @@
-<p align="center"> 
-  <picture>
-    <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
-    <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
-    <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
-  </picture><br>
-  <strong>RESTful + RPC = ♥️</strong>
-</p>
-
 <p align="center">
-  Back-end meta-framework for <a href="https://nextjs.org/docs/app">Next.js</a>
+  <a href="https://vovk.dev">
+    <picture>
+      <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
+      <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
+      <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
+    </picture>
+  </a>
+  <br>
+  <strong>Back-end for <a href="https://nextjs.org/">Next.js</a></strong>
 </p>
 
 ---
 
 ## vovk-cli [![npm version](https://badge.fury.io/js/vovk-cli.svg)](https://www.npmjs.com/package/vovk-cli)
 
-The Vovk.ts CLI that generates schema and client but also provides some useful utilities for the development process.
+The Vovk.ts [CLI](https://vovk.dev/cli) that will be used as a devDependency in a Vovk.ts app.
 
 ```sh
 npm install -D vovk-cli
 ```
 
-- [vovk dev](https://vovk.dev/cli/vovk-dev) - starts the development script that watches the changes in controllers and regenerates the schema and client.
-- [vovk generate](https://vovk.dev/cli/vovk-generate) - generates the client based on the schema.
-- [vovk init](https://vovk.dev/cli/vovk-init) - initializes the Vovk.ts project.
-- [vovk new](https://vovk.dev/cli/vovk-new) - generates a new controller, service or a custom module.
+- [vovk dev](https://vovk.dev/dev) - starts the development script that watches the changes in [controllers](https://vovk.dev/controller) and regenerates the [schema](https://vovk.dev/schema) and [client](https://vovk.dev/typescript).
+- [vovk generate](https://vovk.dev/generate) - generates the client based on the schema.
+- [vovk bundle](https://vovk.dev/bundle) - bundles the client with [tsdown](https://tsdown.dev/).
+- [vovk init](https://vovk.dev/init) - initializes Vovk.ts project.
+- [vovk new](https://vovk.dev/new) - generates a new controller, service or a custom module.
 
-For more information, please visit the [CLI documentation](https://vovk.dev/cli) or use `npx vovk-cli --help` to get the list of available commands and options.
+```sh
+npx vovk-cli --help
+```

package/client-templates/readme/README.md.ejs

@@ -18,9 +18,9 @@
 ## <%= controllerSchema.rpcModuleName %>
         <% Object.entries(controllerSchema.handlers).forEach(([handlerName, handlerSchema]) => { %>
 ### <%= controllerSchema.rpcModuleName %>.<%= handlerName %>
-<%- handlerSchema.openapi?.summary ? `> ${handlerSchema.openapi.summary}` : '' %>
+<%- handlerSchema.operationObject?.summary ? `> ${handlerSchema.operationObject.summary}` : '' %>
 
-<%- handlerSchema.openapi?.description ? `${handlerSchema.openapi.description}` : '' %>
+<%- handlerSchema.operationObject?.description ? `${handlerSchema.operationObject.description}` : '' %>
 
 <% const forceApiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? controllerSchema.forceApiRoot; %>
 `<%= handlerSchema.httpMethod %> <%= [...(forceApiRoot ? [forceApiRoot] : [t.apiRoot, segmentName]), controllerSchema.prefix, handlerSchema.path].map((part, i) => i > 0 ? t._.trim(part, '/') : part).filter(Boolean).join('/') %>`

package/dist/bundle/index.mjs

@@ -1,23 +1,39 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import { build } from 'tsdown';
 import groupBy from 'lodash/groupBy.js';
 import { generate } from '../generate/generate.mjs';
 import { BuiltInTemplateName } from '../getProjectInfo/getConfig/getTemplateDefs.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import { locateSegments } from '../locateSegments.mjs';
+/*
+async function tsdownBundle({
+  outDirAbsolute,
+  tsFullClientOutAbsoluteDirInput,
+}: {
+  outDirAbsolute: string;
+  tsFullClientOutAbsoluteDirInput: string;
+}) {
+  const { build } = await import('tsdown');
+
+  await build({
+    entry: path.join(tsFullClientOutAbsoluteDirInput, './index.ts'),
+    dts: true,
+    format: ['cjs', 'esm'],
+    hash: false,
+    fixedExtension: true,
+    clean: true,
+    ...tsdownBuildOptions,
+    outDir: outDirAbsolute,
+  });
+} */
 export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
     const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
     const locatedSegments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const { bundle: bundleConfig } = config;
-    const tsFullClientOutAbsoluteDirInput = path.join(cwd, bundleConfig.prebundleOutDir);
-    const prebundleOutDir = cliBundleOptions?.prebundleOutDir ?? bundleConfig.prebundleOutDir;
     const keepPrebundleDir = cliBundleOptions?.keepPrebundleDir ?? bundleConfig?.keepPrebundleDir ?? false;
-    if (!prebundleOutDir) {
-        throw new Error('No output directory specified for composed client');
-    }
-    const outDir = cliBundleOptions?.outDir ?? bundleConfig.tsdownBuildOptions.outDir;
-    const tsconfig = cliBundleOptions?.tsconfig ?? bundleConfig.tsdownBuildOptions.tsconfig;
+    const prebundleOutDirAbsolute = path.resolve(cwd, cliBundleOptions?.prebundleOutDir ?? bundleConfig.prebundleOutDir);
+    const entry = path.join(prebundleOutDirAbsolute, 'index.ts');
+    const outDir = cliBundleOptions?.outDir ?? bundleConfig.outDir;
     if (!outDir) {
         throw new Error('No output directory specified for bundling');
     }
@@ -37,47 +53,19 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             openapiGetMethodName: cliBundleOptions?.openapiGetMethodName,
             openapiRootUrl: cliBundleOptions?.openapiRootUrl,
             composedFrom: [BuiltInTemplateName.ts],
-            composedOut: prebundleOutDir,
+            composedOut: prebundleOutDirAbsolute,
             composedOnly: true,
             composedIncludeSegments: cliBundleOptions.includeSegments ?? bundleConfig.includeSegments,
             composedExcludeSegments: cliBundleOptions.excludeSegments ?? bundleConfig.excludeSegments,
         },
     });
-    log.debug('Bundling index.ts');
-    await build({
-        entry: path.join(tsFullClientOutAbsoluteDirInput, './index.ts'),
-        dts: true,
-        format: ['cjs', 'esm'],
-        hash: false,
-        fixedExtension: true,
-        clean: true,
-        ...bundleConfig.tsdownBuildOptions,
+    log.debug(`Bundling ${chalkHighlightThing(entry)} to ${chalkHighlightThing(outDirAbsolute)}`);
+    await bundleConfig.build({
         outDir: outDirAbsolute,
-        tsconfig,
+        prebundleDir: prebundleOutDirAbsolute,
+        entry,
     });
     log.debug(`Bundled index.ts to ${chalkHighlightThing(outDirAbsolute)}`);
-    log.debug('Bundling schema.ts');
-    await build({
-        entry: path.join(tsFullClientOutAbsoluteDirInput, './schema.ts'),
-        dts: true,
-        format: ['cjs'],
-        fixedExtension: true,
-        outDir: outDirAbsolute,
-        clean: false,
-        tsconfig,
-    });
-    log.debug(`Bundled schema.ts to ${chalkHighlightThing(outDirAbsolute)}`);
-    log.debug('Bundling openapi.ts');
-    await build({
-        entry: path.join(tsFullClientOutAbsoluteDirInput, './openapi.ts'),
-        dts: true,
-        format: ['cjs'],
-        fixedExtension: true,
-        outDir: outDirAbsolute,
-        clean: false,
-        tsconfig,
-    });
-    log.debug(`Bundled openapi.ts to ${chalkHighlightThing(outDirAbsolute)}`);
     const requiresGroup = groupBy(Object.entries(bundleConfig.requires), ([, relativePath]) => relativePath);
     for (const [relativePath, group] of Object.entries(requiresGroup)) {
         await generate({
@@ -96,11 +84,11 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         });
     }
     if (!keepPrebundleDir) {
-        await fs.rm(tsFullClientOutAbsoluteDirInput, { recursive: true, force: true });
-        log.debug(`Deleted temporary TypeScript client output directory: ${chalkHighlightThing(tsFullClientOutAbsoluteDirInput)}`);
+        await fs.rm(prebundleOutDirAbsolute, { recursive: true, force: true });
+        log.debug(`Deleted temporary TypeScript client output directory: ${chalkHighlightThing(prebundleOutDirAbsolute)}`);
     }
     else {
-        log.debug(`Temporary TypeScript client output directory not deleted: ${chalkHighlightThing(tsFullClientOutAbsoluteDirInput)}`);
+        log.debug(`Temporary TypeScript client output directory not deleted because it is marked to keep: ${chalkHighlightThing(prebundleOutDirAbsolute)}`);
     }
     log.info(`Bundled TypeScript client to ${chalkHighlightThing(outDirAbsolute)}`);
 }

package/dist/generate/generate.mjs

@@ -94,7 +94,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             .map((segment) => ({ ...segment }))),
     };
     const { config, cwd, log, srcRoot, vovkCliPackage, packageJson: projectPackageJson } = projectInfo;
-    Object.entries(config.generatorConfig.segments ?? {})
+    Object.entries(config.outputConfig.segments ?? {})
         .filter(([, segmentConfig]) => segmentConfig.openAPIMixin)
         .forEach(([segmentName, segmentConfig]) => {
         fullSchema.segments = {
@@ -144,7 +144,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 : { data: { imports: [] }, content: templateContent };
             const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                 schema: fullSchema,
-                configs: [{ origin: cliGenerateOptions?.origin }, templateDef.generatorConfig ?? {}],
+                configs: [{ origin: cliGenerateOptions?.origin }, templateDef.outputConfig ?? {}],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
@@ -229,7 +229,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
                 const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                     schema: fullSchema,
-                    configs: [{ origin: cliGenerateOptions?.origin }, templateDef.generatorConfig ?? {}],
+                    configs: [{ origin: cliGenerateOptions?.origin }, templateDef.outputConfig ?? {}],
                     projectPackageJson,
                     segmentName,
                     isBundle,

package/dist/generate/getClientTemplateFiles.mjs

@@ -73,7 +73,7 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
                 }
                 def = {
                     ...def,
-                    generatorConfig: merge({}, templateDef?.generatorConfig, def.generatorConfig),
+                    outputConfig: merge({}, templateDef?.outputConfig, def.outputConfig),
                     composedClient: merge(omit(templateDef?.composedClient ?? {}, ['outDir']), def.composedClient),
                     segmentedClient: merge(omit(templateDef?.segmentedClient ?? {}, ['outDir']), def.segmentedClient),
                 };

package/dist/generate/writeOneClientFile.d.mts

@@ -23,7 +23,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     package: PackageJson;
     readme: VovkReadmeConfig;
     samples: VovkSamplesConfig;
-    reExports: VovkStrictConfig['generatorConfig']['reExports'];
+    reExports: VovkStrictConfig['outputConfig']['reExports'];
     isEnsuringClient: boolean;
     outCwdRelativeDir: string;
     templateDef: VovkStrictConfig['clientTemplateDefs'][string];

package/dist/generate/writeOneClientFile.mjs

@@ -85,8 +85,8 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
                 ? path.relative(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '.'), path.resolve(cwd, routeFilePath))
                 : null;
             const segmentConfig = {
-                ...config.generatorConfig.segments?.[sName],
-                // ...templateDef.generatorConfig?.segments?.[sName],
+                ...config.outputConfig.segments?.[sName],
+                // ...templateDef.outputConfig?.segments?.[sName],
             };
             const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride } = segmentConfig;
             return [

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -149,9 +149,9 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
                         ...builtIn.segmentedClient,
                         ...templateDef.segmentedClient,
                     },
-                    generatorConfig: {
-                        ...builtIn.generatorConfig,
-                        ...templateDef.generatorConfig,
+                    outputConfig: {
+                        ...builtIn.outputConfig,
+                        ...templateDef.outputConfig,
                     },
                     // 'requires' and other props will be overridden
                 };

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

@@ -48,10 +48,13 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             requires?: Record<string, string>;
             prebundleOutDir?: string;
             keepPrebundleDir?: boolean;
-            tsdownBuildOptions?: Parameters<typeof import("tsdown/index.mjs") extends {
-                build: infer T;
-            } ? T : never>[0];
-            generatorConfig?: import("vovk").VovkGeneratorConfig<{
+            outDir?: string;
+            build: (options: {
+                outDir: string;
+                prebundleDir: string;
+                entry: string;
+            }) => Promise<void>;
+            outputConfig?: import("vovk").VovkOutputConfig<{
                 fetcher?: string | [string, string] | [string];
                 validateOnClient?: string | [string, string] | [string] | null;
                 createRPC?: string | [string, string] | [string];
@@ -70,7 +73,7 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             controller?: string;
             [key: string]: string | undefined;
         };
-        generatorConfig?: import("vovk").VovkGeneratorConfig<{
+        outputConfig?: import("vovk").VovkOutputConfig<{
             fetcher?: string | [string, string] | [string];
             validateOnClient?: string | [string, string] | [string] | null;
             createRPC?: string | [string, string] | [string];

package/dist/getProjectInfo/getConfig/index.mjs

@@ -38,16 +38,17 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         bundle: {
             prebundleOutDir: conf.bundle?.prebundleOutDir ?? 'tmp_prebundle',
             keepPrebundleDir: conf.bundle?.keepPrebundleDir ?? false,
+            outDir: conf.bundle?.outDir ?? 'dist',
             requires: {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
             },
-            generatorConfig: {},
+            outputConfig: {},
+            build: conf.bundle?.build ??
+                (() => {
+                    throw new Error('No bundle.build function specified');
+                }),
             ...conf.bundle,
-            tsdownBuildOptions: {
-                outDir: conf.bundle?.tsdownBuildOptions?.outDir ?? 'dist',
-                ...conf.bundle?.tsdownBuildOptions,
-            },
         },
         modulesDir: conf.modulesDir ?? path.join(srcRoot ?? '.', 'modules'),
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',
@@ -61,10 +62,10 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
             ...conf.moduleTemplates,
         },
         libs: conf.libs ?? {},
-        generatorConfig: {
-            ...conf.generatorConfig,
-            origin: (env.VOVK_ORIGIN ?? conf?.generatorConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
-            segments: Object.fromEntries(await Promise.all(Object.entries(conf.generatorConfig?.segments ?? {}).map(async ([key, value]) => [
+        outputConfig: {
+            ...conf.outputConfig,
+            origin: (env.VOVK_ORIGIN ?? conf?.outputConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
+            segments: Object.fromEntries(await Promise.all(Object.entries(conf.outputConfig?.segments ?? {}).map(async ([key, value]) => [
                 key,
                 {
                     ...value,

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -10,12 +10,12 @@ export default function getMetaSchema({ config, useEmitConfig }) {
                 ? (config
                     ? pick({
                         ...config,
-                        generatorConfig: config.generatorConfig
+                        outputConfig: config.outputConfig
                             ? {
-                                ...config.generatorConfig,
+                                ...config.outputConfig,
                                 // TODO: Dirty fix! Need to think of a better way to avoid emission of mixins.
-                                segments: config.generatorConfig.segments
-                                    ? mapValues(config.generatorConfig.segments, (segment) => omit(segment, ['openAPIMixin']))
+                                segments: config.outputConfig.segments
+                                    ? mapValues(config.outputConfig.segments, (segment) => omit(segment, ['openAPIMixin']))
                                     : undefined,
                             }
                             : undefined,

package/dist/getProjectInfo/index.mjs

@@ -18,7 +18,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
     if (srcRootRequired && !srcRoot) {
         throw new Error(`Could not find app router directory at ${cwd}. Check Next.js docs for more info.`);
     }
-    const apiRoot = `${config.generatorConfig.origin ?? ''}/${config.rootEntry}`;
+    const apiRoot = `${config.outputConfig.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

@@ -126,7 +126,6 @@ program
     .option('--schema, --schema-path <path>', 'path to schema folder (default: .vovk-schema)')
     .option('--config, --config-path <config>', 'path to config file')
     .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')

package/dist/init/createConfig.mjs

@@ -37,9 +37,9 @@ export default async function createConfig({ root, log, options: { validationLib
             },
         }[validationLibrary ?? 'type'],
     };
-    config.generatorConfig ??= {};
-    config.generatorConfig.imports ??= {};
-    config.generatorConfig.imports.validateOnClient =
+    config.outputConfig ??= {};
+    config.outputConfig.imports ??= {};
+    config.outputConfig.imports.validateOnClient =
         validationLibrary === 'class-validator' ? 'vovk-dto/validateOnClient' : 'vovk-ajv';
     if (validationLibrary && !moduleTemplates) {
         try {

package/dist/types.d.mts

@@ -40,12 +40,12 @@ export interface GenerateOptions {
     logLevel?: LogLevelNames;
 }
 export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'], 'prebundleOutDir' | 'keepPrebundleDir' | 'includeSegments' | 'excludeSegments'>> {
+    bundler?: 'tsdown' | 'ncc';
     configPath?: string;
     schemaPath?: string;
     schema?: string;
     outDir?: string;
     origin?: string;
-    tsconfig?: string;
     openapiSpec?: string[];
     openapiGetModuleName?: string[];
     openapiGetMethodName?: string[];

package/dist/utils/normalizeOpenAPIMixin.d.mts

@@ -8,7 +8,7 @@ export type GetOpenAPINameFn = (config: {
     openAPIObject: OpenAPIObject;
 }) => string;
 export declare function normalizeOpenAPIMixin({ mixinModule, log, cwd, }: {
-    mixinModule: NonNullable<NonNullable<NonNullable<NonNullable<VovkConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>;
+    mixinModule: NonNullable<NonNullable<NonNullable<NonNullable<VovkConfig['outputConfig']>['segments']>[string]>['openAPIMixin']>;
     log: ProjectInfo['log'];
     cwd?: string;
-}): Promise<NonNullable<NonNullable<NonNullable<NonNullable<VovkStrictConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>>;
+}): Promise<NonNullable<NonNullable<NonNullable<NonNullable<VovkStrictConfig['outputConfig']>['segments']>[string]>['openAPIMixin']>>;

package/module-templates/arktype/controller.ts.ejs

@@ -23,13 +23,11 @@ export default class <%= vars.ModuleName %> {
     })
     @get()
     static get<%= t.TheThings %> = withArk({
-        query: type({ search: type('string') }), 
-        handle(req) {
-            const search = req.nextUrl.searchParams.get('search');
+        handle() {
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+            return <%= vars.ServiceName %>.get<%= t.TheThings %>();
             <% } else { %>
-            return { results: [], search };
+            return { message: 'TODO: get <%= t.theThings %>' };
             <% } %>
         }
     });
@@ -39,30 +37,42 @@ export default class <%= vars.ModuleName %> {
     })
     @put('{id}')
     static update<%= t.TheThing %> = withArk({
-        body: type({
-          foo: type('"bar" | "baz"'),
-        }),
-        query: type({ q: type('string') }),
+        body: type({ todo: type('true') }),
         params: type({ id: type('string') }),
         async handle(req, params) {
             const { id } = params;
             const body = await req.json();
-            const q = req.nextUrl.searchParams.get('q');
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
             <% } else { %>
-            return { id, body, q };
+            return { message: `TODO: update <%= t.theThing %>`, id, body };
             <% } %>
         }
     });
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
-    };
+    static create<%= t.TheThing %> = withArk({
+        body: type({ todo: type('true') }),
+        async handle(req) {
+            const body = await req.json();
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+            <% } else { %>
+            return { message: `TODO: create <%= t.theThing %>`, body };
+            <% } %>
+        }
+    });
 
-    @del(':id')
-    static delete<%= t.TheThing %> = () => {
-        // ...
-    };
+    @del('{id}')
+    static delete<%= t.TheThing %> = withArk({
+        params: type({ id: type('string') }),
+        handle(_req, params) {
+            const { id } = params;
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: `TODO: delete <%= t.theThing %>`, id };
+            <% } %>
+        }
+    });
 }

package/module-templates/type/controller.ts.ejs

@@ -20,12 +20,11 @@ export default class <%= vars.ControllerName %> {
         summary: 'Get <%= t.TheThings %>',
     })
     @get()
-    static get<%= t.TheThings %> = async (req: VovkRequest<null, { search: string }>) => {
-        const search = req.nextUrl.searchParams.get('search');
+    static get<%= t.TheThings %> = () => {
         <% if(t.withService) { %>
-        return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+        return <%= vars.ServiceName %>.get<%= t.TheThings %>();
         <% } else { %>
-        return { results: [], search };
+        return { message: 'TODO: get <%= t.theThings %>' };
         <% } %>
     }
 
@@ -33,24 +32,33 @@ export default class <%= vars.ControllerName %> {
         summary: 'Update <%= t.TheThing %>',
     })
     @put('{id}')
-    static update<%= t.TheThing %> = async (req: VovkRequest<{ foo: 'bar' | 'baz' }, { q: string }>, params: { id: string }) => {
+    static update<%= t.TheThing %> = async (req: VovkRequest<{ todo: true }>, params: { id: string }) => {
         const { id } = params;
         const body = await req.json();
-        const q = req.nextUrl.searchParams.get('q');
         <% if(t.withService) { %>
-        return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+        return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
         <% } else { %>
-        return { id, body, q };
+        return { message: `TODO: update <%= t.theThing %>`, id, body };
         <% } %>
     };
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
+    static create<%= t.TheThing %> = async (req: VovkRequest<{ todo: true }>) => {
+        const body = await req.json();
+        <% if(t.withService) { %>
+        return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+        <% } else { %>
+        return { message: `TODO: create <%= t.theThing %>`, body };
+        <% } %>
     };
 
-    @del(':id')
-    static delete<%= t.TheThing %> = () => {
-        // ...
+    @del('{id}')
+    static delete<%= t.TheThing %> = (_req: VovkRequest<unknown>, params: { id: string }) => {
+        const { id } = params;
+        <% if(t.withService) { %>
+        return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+        <% } else { %>
+        return { message: `TODO: delete <%= t.theThing %>`, id };
+        <% } %>
     };
 }

package/module-templates/type/service.ts.ejs

@@ -8,21 +8,30 @@ fileName: <%= vars.ServiceName + '.ts' %>
 sourceName: <%= vars.ServiceName %>
 ---
 
-import type { VovkBody, VovkQuery } from 'vovk';
+import type { VovkBody, VovkParams } from 'vovk';
 import type <%= vars.ControllerName %> from './<%= vars.ControllerName %><%= t.nodeNextResolutionExt.ts %>';
 
 export default class <%= vars.ServiceName %> {
-  static get<%= t.TheThings %> = (search: VovkQuery<typeof <%= vars.ControllerName %>.get<%= t.TheThings %>>['search']) => {
-    return { results: [], search };
+  static get<%= t.TheThings %> = () => {
+    return { message: 'TODO: get <%= t.theThings %>' };
   };
 
   static update<%= t.TheThing %> = (
-    id: string,
-    q: VovkQuery<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>['q'],
+    id: VovkParams<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>['id'],
     body: VovkBody<typeof <%= vars.ControllerName %>.update<%= t.TheThing %>>
   ) => {
-    return { id, q, body };
+    return { message: `TODO: update <%= t.theThing %>`, id, body };
   };
 
-  // ...
+  static create<%= t.TheThing %> = (
+    body: VovkBody<typeof <%= vars.ControllerName %>.create<%= t.TheThing %>>
+  ) => {
+    return { message: `TODO: create <%= t.theThing %>`, body };
+  };
+
+  static delete<%= t.TheThing %> = (
+    id: VovkParams<typeof <%= vars.ControllerName %>.delete<%= t.TheThing %>>['id']
+  ) => {
+    return { message: `TODO: delete <%= t.theThing %>`, id };
+  };
 }

package/module-templates/valibot/controller.ts.ejs

@@ -23,13 +23,11 @@ export default class <%= vars.ModuleName %> {
     })
     @get()
     static get<%= t.TheThings %> = withValibot({
-        query: v.object({ search: v.string() }), 
-        handle(req) {
-            const search = req.nextUrl.searchParams.get('search');
+        handle() {
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.get<%= t.TheThings %>(search);
+            return <%= vars.ServiceName %>.get<%= t.TheThings %>();
             <% } else { %>
-            return { results: [], search };
+            return { message: 'TODO: get <%= t.theThings %>' };
             <% } %>
         }
     });
@@ -39,30 +37,42 @@ export default class <%= vars.ModuleName %> {
     })
     @put('{id}')
     static update<%= t.TheThing %> = withValibot({
-        body: v.object({
-          foo: v.union([v.literal('bar'), v.literal('baz')]),
-        }),
-        query: v.object({ q: v.string() }),
+        body: v.object({ todo: v.literal(true) }),
         params: v.object({ id: v.string() }),
         async handle(req, params) {
             const { id } = params;
             const body = await req.json();
-            const q = req.nextUrl.searchParams.get('q');
             <% if(t.withService) { %>
-            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, q, body);
+            return <%= vars.ServiceName %>.update<%= t.TheThing %>(id, body);
             <% } else { %>
-            return { id, body, q };
+            return { message: `TODO: update <%= t.theThing %>`, id, body };
             <% } %>
         }
     });
 
     @post()
-    static create<%= t.TheThing %> = () => {
-        // ...
-    };
+    static create<%= t.TheThing %> = withValibot({
+        body: v.object({ todo: v.literal(true) }),
+        async handle(req) {
+            const body = await req.json();
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.create<%= t.TheThing %>(body);
+            <% } else { %>
+            return { message: `TODO: create <%= t.theThing %>`, body };
+            <% } %>
+        }
+    });
 
-    @del(':id')
-    static delete<%= t.TheThing %> = () => {
-        // ...
-    };
+    @del('{id}')
+    static delete<%= t.TheThing %> = withValibot({
+        params: v.object({ id: v.string() }),
+        handle(_req, params) {
+            const { id } = params;
+            <% if(t.withService) { %>
+            return <%= vars.ServiceName %>.delete<%= t.TheThing %>(id);
+            <% } else { %>
+            return { message: `TODO: delete <%= t.theThing %>`, id };
+            <% } %>
+        }
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.380",
+  "version": "0.0.1-draft.382",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,14 +35,14 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.461",
-    "vovk-ajv": "^0.0.0-draft.108",
-    "vovk-client": "^0.0.4-draft.135",
-    "vovk-python": "^0.0.1-draft.77",
-    "vovk-rust": "^0.0.1-draft.63"
+    "vovk": "^3.0.0-draft.464",
+    "vovk-ajv": "^0.0.0-draft.110",
+    "vovk-client": "^0.0.4-draft.137",
+    "vovk-python": "^0.0.1-draft.79",
+    "vovk-rust": "^0.0.1-draft.65"
   },
   "optionalDependencies": {
-    "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.41"
+    "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.44"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
@@ -68,7 +68,6 @@
     "prettier": "^3.6.2",
     "tar-stream": "^3.1.7",
     "ts-morph": "^27.0.0",
-    "tsdown": "^0.15.7",
     "type-fest": "^5.0.1",
     "undici": "^7.16.0",
     "yaml": "^2.8.1"
@@ -84,6 +83,7 @@
     "create-next-app": "^15.5.4",
     "http-server": "^14.1.1",
     "node-pty": "^1.0.0",
+    "tsdown": "^0.15.9",
     "zod": "^4.1.11"
   }
 }