vovk-cli 0.0.1-draft.4 → 0.0.1-draft.40

package/dist/initProgram.mjs

@@ -0,0 +1,21 @@
+import { Init } from './init/index.mjs';
+// reused at vovk-init
+export default function initProgram(program) {
+    return program
+        .argument('[prefix]', 'Directory to initialize project in', '.')
+        .description('Initialize Vovk project')
+        .option('-y, --yes', 'Skip all prompts and use default values')
+        .option('--log-level <level>', 'Set log level', 'info')
+        .option('--use-npm', 'Use npm as package manager')
+        .option('--use-yarn', 'Use yarn as package manager')
+        .option('--use-pnpm', 'Use pnpm as package manager')
+        .option('--use-bun', 'Use bun as package manager')
+        .option('--skip-install', 'Skip installing dependencies')
+        .option('--update-ts-config', 'Update tsconfig.json')
+        .option('--update-scripts <mode>', 'Update package.json scripts ("implicit" or "explicit")')
+        .option('--validation-library <library>', 'Validation library to use ("vovk-zod", "vovk-yup", "vovk-dto" or another). Set to "none" to skip validation')
+        .option('--validate-on-client', 'Path to validateOnClient file')
+        .option('--channel <channel>', 'Channel to use for fetching packages', 'latest')
+        .option('--dry-run', 'Do not write files to disk')
+        .action((prefix = '.', options) => new Init().main(prefix, options));
+}

package/dist/locateSegments.mjs

@@ -1,5 +1,5 @@
-import { promises as fs } from 'fs';
-import * as path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import getFileSystemEntryType from './utils/getFileSystemEntryType.mjs';
 export default async function locateSegments(dir, rootDir = dir) {
     let results = [];
@@ -16,7 +16,7 @@ export default async function locateSegments(dir, rootDir = dir) {
                 const routeFilePath = path.join(filePath, 'route.ts');
                 if (await getFileSystemEntryType(routeFilePath)) {
                     // Calculate the basePath relative to the root directory
-                    const segmentName = path.relative(rootDir, dir);
+                    const segmentName = path.relative(rootDir, dir).replace(/\\/g, '/'); // windows fix
                     results.push({ routeFilePath, segmentName });
                 }
             }

package/dist/new/addClassToSegmentCode.mjs

@@ -1,6 +1,10 @@
-import { Project, SyntaxKind } from 'ts-morph';
+import { Project, QuoteKind, SyntaxKind } from 'ts-morph';
 export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, type, importPath, }) {
-    const project = new Project();
+    const project = new Project({
+        manipulationSettings: {
+            quoteKind: QuoteKind.Single,
+        },
+    });
     const sourceFile = project.createSourceFile('route.ts', segmentSourceCode, { overwrite: true });
     // Add the import if it doesn't exist
     let importDeclaration = sourceFile.getImportDeclaration((imp) => {

package/dist/new/addCommonTerms.mjs

@@ -2,6 +2,7 @@ import pluralize from 'pluralize';
 // feel free to open a direct PR if you have more common terms to add
 const terms = [
     ['entity', 'entities'],
+    ['entry', 'entries'],
     ['regex', 'regexes'],
     ['index', 'indices'],
     ['matrix', 'matrices'],

package/dist/new/index.d.mts

@@ -1,2 +1,2 @@
-import type { NewOptions } from '../index.mjs';
-export default function newComponents(components: string[], options: NewOptions): Promise<void>;
+import type { NewOptions } from '../types.mjs';
+export default function newComponents(components: string[], { dryRun, dir, templates, overwrite, noSegmentUpdate }: NewOptions): Promise<void>;

package/dist/new/index.mjs

@@ -1,7 +1,8 @@
 import newModule from './newModule.mjs';
 import newSegment from './newSegment.mjs';
-export default async function newComponents(components, options) {
+export default async function newComponents(components, { dryRun, dir, templates, overwrite, noSegmentUpdate }) {
     if (components[0] === 'segment' || components[0] === 'segments') {
+        // vovk new segment [segmentName]
         let segmentNames = components
             .slice(1)
             .map((segmentName) => (segmentName === '""' || segmentName === "''" ? '' : segmentName));
@@ -9,10 +10,11 @@ export default async function newComponents(components, options) {
             segmentNames = [''];
         }
         for (const segmentName of segmentNames) {
-            await newSegment({ segmentName, dryRun: options.dryRun });
+            await newSegment({ segmentName, overwrite, dryRun });
         }
     }
     else {
+        // vovk new [what...] [moduleNameWithOptionalSegment]
         if (components.length < 2) {
             throw new Error('Invalid command invocation. Please provide at least two arguments.');
         }
@@ -21,6 +23,14 @@ export default async function newComponents(components, options) {
         if (!moduleNameWithOptionalSegment) {
             throw new Error('A module name with an optional segment cannot be empty');
         }
-        await newModule({ what, moduleNameWithOptionalSegment, dryRun: options.dryRun });
+        await newModule({
+            what,
+            moduleNameWithOptionalSegment,
+            dir,
+            templates,
+            overwrite,
+            noSegmentUpdate,
+            dryRun,
+        });
     }
 }

package/dist/new/newModule.d.mts

@@ -1,5 +1,9 @@
-export default function newModule({ what, moduleNameWithOptionalSegment, dryRun, }: {
+export default function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, }: {
     what: string[];
     moduleNameWithOptionalSegment: string;
-    dryRun: boolean;
+    dryRun?: boolean;
+    dir?: string;
+    templates?: string[];
+    noSegmentUpdate?: boolean;
+    overwrite?: boolean;
 }): Promise<void>;

package/dist/new/newModule.mjs

@@ -1,11 +1,11 @@
-import path from 'path';
-import fs from 'fs/promises';
-import getProjectInfo from '../getProjectInfo/index.mjs';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import render from './render.mjs';
+import addClassToSegmentCode from './addClassToSegmentCode.mjs';
+import getProjectInfo from '../getProjectInfo/index.mjs';
+import locateSegments from '../locateSegments.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
-import locateSegments from '../locateSegments.mjs';
-import addClassToSegmentCode from './addClassToSegmentCode.mjs';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 import prettify from '../utils/prettify.mjs';
 function splitByLast(str, delimiter = '/') {
@@ -18,9 +18,9 @@ function splitByLast(str, delimiter = '/') {
     const after = str.substring(index + delimiter.length);
     return [before, after];
 }
-export default async function newModule({ what, moduleNameWithOptionalSegment, dryRun, }) {
+export default async function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, }) {
     const { config, log, apiDir, cwd } = await getProjectInfo();
-    const templates = config.templates;
+    let templates = config.templates;
     const [segmentName, moduleName] = splitByLast(moduleNameWithOptionalSegment);
     // replace c by controller, s by service, w by worker, everything else keeps the same
     what = what.map((s) => {
@@ -35,16 +35,24 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
                 return s;
         }
     });
-    // check if template exists
+    if (templatesFlag) {
+        if (templatesFlag.length > what.length) {
+            throw new Error('Too many templates provided');
+        }
+        templates = templatesFlag.reduce((acc, templatePath, index) => ({
+            ...acc,
+            [what[index]]: templatePath,
+        }), templates);
+    }
     for (const type of what) {
         if (!templates[type]) {
-            throw new Error(`Template for ${type} not found in config`);
+            throw new Error(`Template for "${type}" not found`);
         }
     }
     const segments = await locateSegments(apiDir);
     const segment = segments.find((s) => s.segmentName === segmentName);
     if (!segment) {
-        throw new Error(`Segment ${segmentName} not found`);
+        throw new Error(`Unable to create module. Segment "${segmentName}" not found. Run "vovk new segment ${segmentName}" to create it`);
     }
     for (const type of what) {
         const templatePath = templates[type];
@@ -52,39 +60,55 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             ? path.resolve(cwd, templatePath)
             : path.resolve(cwd, './node_modules', templatePath);
         const templateCode = await fs.readFile(templateAbsolutePath, 'utf-8');
-        const { filePath, sourceName, compiledName, code } = await render(templateCode, {
+        const { dir: renderedDir, fileName, sourceName, compiledName, code, } = await render(templateCode, {
+            cwd,
             config,
             withService: what.includes('service'),
             segmentName,
             moduleName,
         });
-        const absoluteModulePath = path.join(cwd, config.modulesDir, filePath);
-        const dirName = path.dirname(absoluteModulePath);
+        const dir = dirFlag || renderedDir;
+        if (!dir) {
+            throw new Error(`The template for "${type}" does not provide a dir`);
+        }
+        if (!fileName) {
+            throw new Error(`The template for "${type}" does not provide a fileName`);
+        }
+        const absoluteModuleDir = path.join(cwd, dir);
+        const absoluteModulePath = path.join(absoluteModuleDir, fileName);
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
-            if (await getFileSystemEntryType(absoluteModulePath)) {
+            if (!overwrite && (await getFileSystemEntryType(absoluteModulePath))) {
                 log.warn(`File ${chalkHighlightThing(absoluteModulePath)} already exists, skipping this "${type}"`);
             }
             else {
-                await fs.mkdir(dirName, { recursive: true });
+                await fs.mkdir(absoluteModuleDir, { recursive: true });
                 await fs.writeFile(absoluteModulePath, prettiedCode);
+                log.info(`Created ${chalkHighlightThing(fileName)} using ${chalkHighlightThing(`"${type}"`)} template for ${formatLoggedSegmentName(segmentName)}`);
             }
         }
         if (type === 'controller' || type === 'worker') {
+            if (!sourceName) {
+                throw new Error(`The template for "${type}" does not provide a sourceName`);
+            }
+            if (!compiledName) {
+                throw new Error('The template for "${type}" does not provide a compiledName');
+            }
             const { routeFilePath } = segment;
             const segmentSourceCode = await fs.readFile(routeFilePath, 'utf-8');
-            const importPath = path.relative(dirName, absoluteModulePath).replace(/\.(ts|tsx)$/, '');
-            const newSegmentCode = addClassToSegmentCode(segmentSourceCode, {
-                sourceName,
-                compiledName,
-                type,
-                importPath,
-            });
-            if (!dryRun) {
-                await fs.writeFile(routeFilePath, newSegmentCode);
+            const importPath = path.relative(path.dirname(routeFilePath), absoluteModulePath).replace(/\.(ts|tsx)$/, '');
+            if (!noSegmentUpdate) {
+                const newSegmentCode = await prettify(addClassToSegmentCode(segmentSourceCode, {
+                    sourceName,
+                    compiledName,
+                    type,
+                    importPath,
+                }), routeFilePath);
+                if (!dryRun) {
+                    await fs.writeFile(routeFilePath, newSegmentCode);
+                }
             }
-            log.info(`Added ${chalkHighlightThing(sourceName)} ${type} to ${formatLoggedSegmentName(segmentName)} as ${chalkHighlightThing(compiledName)}`);
+            log.info(`Added ${chalkHighlightThing(sourceName)} ${type} as ${chalkHighlightThing(compiledName)} to ${formatLoggedSegmentName(segmentName)}`);
         }
-        log.info(`Created ${chalkHighlightThing(sourceName)} with ${chalkHighlightThing(type)} template for ${formatLoggedSegmentName(segmentName)}`);
     }
 }

package/dist/new/newSegment.d.mts

@@ -1,4 +1,5 @@
-export default function newSegment({ segmentName, dryRun }: {
+export default function newSegment({ segmentName, overwrite, dryRun, }: {
     segmentName: string;
-    dryRun: boolean;
+    overwrite?: boolean;
+    dryRun?: boolean;
 }): Promise<void>;

package/dist/new/newSegment.mjs

@@ -1,14 +1,14 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import getProjectInfo from '../getProjectInfo/index.mjs';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import prettify from '../utils/prettify.mjs';
-export default async function newSegment({ segmentName, dryRun }) {
+export default async function newSegment({ segmentName, overwrite, dryRun, }) {
     const { apiDir, cwd, log } = await getProjectInfo();
     const absoluteSegmentRoutePath = path.join(cwd, apiDir, segmentName, '[[...vovk]]/route.ts');
-    if (await getFileSystemEntryType(absoluteSegmentRoutePath)) {
+    if (!overwrite && (await getFileSystemEntryType(absoluteSegmentRoutePath))) {
         throw new Error(`Unable to create new segment. ${formatLoggedSegmentName(segmentName, { upperFirst: true })} already exists.`);
     }
     const code = await prettify(`import { initVovk } from 'vovk';
@@ -29,5 +29,5 @@ ${segmentName ? `  segmentName: '${segmentName}',\n` : ''}  emitSchema: true,
         await fs.mkdir(path.dirname(absoluteSegmentRoutePath), { recursive: true });
         await fs.writeFile(absoluteSegmentRoutePath, code);
     }
-    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} created at ${absoluteSegmentRoutePath}. Run ${chalkHighlightThing(`vovk new controller ${segmentName}/someName`)} to create a controller or modify the segment file manually`);
+    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} created at ${absoluteSegmentRoutePath}. Run ${chalkHighlightThing(`vovk new controller ${[segmentName, 'thing'].filter(Boolean).join('/')}`)} to create a new controller`);
 }

package/dist/new/render.d.mts

@@ -1,12 +1,8 @@
-import type { VovkConfig } from '../types.mjs';
+import type { VovkConfig, VovkModuleRenderResult } from '../types.mjs';
 export default function render(codeTemplate: string, { config, withService, segmentName, moduleName, }: {
+    cwd: string;
     config: VovkConfig;
     withService: boolean;
     segmentName: string;
     moduleName: string;
-}): Promise<{
-    filePath: string;
-    sourceName: string;
-    compiledName: string;
-    code: string;
-}>;
+}): Promise<VovkModuleRenderResult>;

package/dist/new/render.mjs

@@ -5,7 +5,7 @@ import pluralize from 'pluralize';
 import addCommonTerms from './addCommonTerms.mjs';
 addCommonTerms();
 export default async function render(codeTemplate, { config, withService, segmentName, moduleName, }) {
-    const getModulePath = (givenSegmentName, givenModuleName, fileName) => [givenSegmentName || config.rootSegmentModulesDirName, _.camelCase(givenModuleName), fileName]
+    const getModuleDirName = (givenSegmentName, givenModuleName) => [config.modulesDir, givenSegmentName || config.rootSegmentModulesDirName, _.camelCase(givenModuleName)]
         .filter(Boolean)
         .join('/');
     const templateVars = {
@@ -15,15 +15,19 @@ export default async function render(codeTemplate, { config, withService, segmen
         segmentName,
         moduleName,
         // utils
-        getModulePath,
+        getModuleDirName,
         // libraries
         _, // lodash
         pluralize,
     };
-    // first, render the front matter because it can use ejs variables
     const parsed = matter((await ejs.render(codeTemplate, templateVars, { async: true })).trim());
-    const { filePath, sourceName, compiledName } = parsed.data;
-    const templateContent = parsed.content;
-    const code = await ejs.render(templateContent, templateVars, { async: true });
-    return { filePath, sourceName, compiledName, code };
+    const { dir, fileName, sourceName, compiledName } = parsed.data;
+    const code = parsed.content;
+    return {
+        dir,
+        fileName,
+        sourceName,
+        compiledName,
+        code,
+    };
 }

package/dist/postinstall.mjs

@@ -1,5 +1,5 @@
-import { promises as fs } from 'fs';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 /**
  * Checks if a file exists at the given path.
  * @param {string} filePath - The path to the file.
@@ -11,7 +11,9 @@ async function postinstall() {
     const js = path.join(vovk, 'client.js');
     const ts = path.join(vovk, 'client.d.ts');
     const index = path.join(vovk, 'index.ts');
-    if ((await getFileSystemEntryType(js)) || (await getFileSystemEntryType(ts)) || (await getFileSystemEntryType(index))) {
+    if ((await getFileSystemEntryType(js)) ||
+        (await getFileSystemEntryType(ts)) ||
+        (await getFileSystemEntryType(index))) {
         return;
     }
     await fs.mkdir(vovk, { recursive: true });

package/dist/types.d.mts

@@ -1,4 +1,4 @@
-import { LogLevelNames } from 'loglevel';
+import type { LogLevelNames } from 'loglevel';
 export type KnownAny = any;
 export type VovkEnv = {
     PORT?: string;
@@ -37,3 +37,38 @@ export type VovkConfig = {
         [key: string]: string | undefined;
     };
 };
+export type VovkModuleRenderResult = {
+    fileName: string;
+    dir: string;
+    sourceName?: string;
+    compiledName?: string;
+    code: string;
+};
+export interface DevOptions {
+    nextDev?: boolean;
+}
+export interface GenerateOptions {
+    clientOut?: string;
+}
+export interface InitOptions {
+    yes?: boolean;
+    logLevel: LogLevelNames;
+    useNpm?: boolean;
+    useYarn?: boolean;
+    usePnpm?: boolean;
+    useBun?: boolean;
+    skipInstall?: boolean;
+    updateTsConfig?: boolean;
+    updateScripts?: 'implicit' | 'explicit';
+    validationLibrary?: string | null;
+    validateOnClient?: boolean;
+    dryRun?: boolean;
+    channel?: 'latest' | 'beta' | 'draft';
+}
+export interface NewOptions {
+    dryRun?: boolean;
+    templates?: string[];
+    dir?: string;
+    overwrite?: boolean;
+    noSegmentUpdate?: boolean;
+}

package/dist/utils/debounceWithArgs.d.mts

@@ -1,2 +1,2 @@
 import { KnownAny } from '../types.mjs';
-export default function debounceWithArgs<T extends (...args: KnownAny[]) => KnownAny>(fn: T, wait: number): (...args: Parameters<T>) => void | Promise<void>;
+export default function debounceWithArgs<Callback extends (...args: KnownAny[]) => KnownAny>(callback: Callback, wait: number): (...args: Parameters<Callback>) => Promise<Awaited<ReturnType<Callback>>>;

package/dist/utils/debounceWithArgs.mjs

@@ -1,14 +1,29 @@
-import debounce from 'lodash/debounce.js';
-export default function debounceWithArgs(fn, wait) {
-    const debouncedFunctions = new Map();
+export default function debounceWithArgs(callback, wait) {
+    // Stores timeouts keyed by the stringified arguments
+    const timeouts = new Map();
     return (...args) => {
+        // Convert arguments to a JSON string (or any other stable key generation)
         const key = JSON.stringify(args);
-        if (!debouncedFunctions.has(key)) {
-            debouncedFunctions.set(key, debounce(fn, wait));
-        }
-        const debouncedFn = debouncedFunctions.get(key);
-        if (debouncedFn) {
-            debouncedFn(...args);
+        // Clear any existing timer for this specific key
+        if (timeouts.has(key)) {
+            clearTimeout(timeouts.get(key));
         }
+        // Return a promise that resolves/rejects after the debounce delay
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(async () => {
+                try {
+                    const result = await callback(...args);
+                    resolve(result);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    // Remove the entry once the callback is invoked
+                    timeouts.delete(key);
+                }
+            }, wait);
+            timeouts.set(key, timeoutId);
+        });
     };
 }

package/dist/utils/formatLoggedSegmentName.mjs

@@ -1,5 +1,5 @@
-import chalkHighlightThing from './chalkHighlightThing.mjs';
 import upperFirstLodash from 'lodash/upperFirst.js';
+import chalkHighlightThing from './chalkHighlightThing.mjs';
 export default function formatLoggedSegmentName(segmentName, { withChalk = true, upperFirst = false } = {}) {
     let text = segmentName ? `segment "${segmentName}"` : 'the root segment';
     text = upperFirst ? upperFirstLodash(text) : text;

package/dist/utils/getAvailablePort.mjs

@@ -1,4 +1,5 @@
-import net from 'net';
+import net from 'node:net';
+// Created with AI
 /**
  * Checks if a port is available.
  * @param {number} port - The port to check.
@@ -34,7 +35,7 @@ function getAvailablePort(startPort, maxAttempts, attempt, onWarning) {
                 getAvailablePort(startPort + 1, maxAttempts, attempt + 1, onWarning).then(resolve, reject);
             }
             else {
-                reject('No available ports found');
+                reject(new Error('No available ports found'));
             }
         });
     });

package/dist/utils/getFileSystemEntryType.mjs

@@ -1,4 +1,4 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 export var FileSystemEntryType;
 (function (FileSystemEntryType) {
     FileSystemEntryType["FILE"] = "FILE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.4",
+  "version": "0.0.1-draft.40",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -10,9 +10,12 @@
   "prefix": ".",
   "scripts": {
     "build": "rm -rf dist tsconfig.build.tsbuildinfo && tsc -P tsconfig.build.json",
+    "postbuild": "chmod +x ./dist/index.mjs",
     "build-test": "rm -rf test_dist && tsc -P tsconfig.test.json",
-    "test": "npm run build && chmod +x ./dist/index.mjs && npm run build-test && node --test --test-only test_dist/test/**/*.mjs",
-    "test_": "npm run build && chmod +x ./dist/index.mjs && NODE_OPTIONS=\"--loader ts-node/esm\" TS_NODE_PROJECT=./tsconfig.test.json node --test --test-only test/**.mts",
+    "pre-test": "npm run build && npm run build-test",
+    "test-only": "npm run pre-test && node --test --test-only test_dist/test/**/*.mjs",
+    "test": "npm run pre-test && node --test --test-concurrency=1 test_dist/test/**/*.mjs",
+    "tsc": "tsc --noEmit",
     "ncu": "npm-check-updates -u",
     "npm-publish": "npm publish"
   },
@@ -33,15 +36,15 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.3"
+    "vovk": "^3.0.0-draft.34"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.0.0",
-    "@npmcli/package-json": "^6.0.1",
+    "@inquirer/prompts": "^7.1.0",
+    "@npmcli/package-json": "^6.1.0",
     "chalk": "^5.3.0",
     "chokidar": "^4.0.1",
     "commander": "^12.1.0",
-    "concurrently": "^9.0.1",
+    "concurrently": "^9.1.0",
     "dotenv": "^16.4.5",
     "ejs": "^3.1.10",
     "gray-matter": "^4.0.3",
@@ -50,10 +53,10 @@
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",
     "pluralize": "^8.0.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.1",
     "tar-stream": "^3.1.7",
     "ts-morph": "^24.0.0",
-    "undici": "^6.20.1"
+    "undici": "^7.0.0"
   },
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",
@@ -62,8 +65,8 @@
     "@types/pluralize": "^0.0.33",
     "@types/tar-stream": "^3.1.3",
     "concat-stream": "^2.0.0",
-    "create-next-app": "^15.0.1",
+    "create-next-app": "^15.0.3",
     "node-pty": "^1.0.0",
-    "type-fest": "^4.26.1"
+    "type-fest": "^4.29.0"
   }
 }

package/templates/controller.ejs

@@ -1,50 +1,52 @@
 <% var modulePascalName = _.upperFirst(_.camelCase(moduleName)); %>
 <% var modulePascalNamePlural = pluralize(modulePascalName); %>
-<% var ControllerName = modulePascalName + 'Controller'; %>
-<% var RPCName = modulePascalName + 'RPC'; %>
-<% var ServiceName = modulePascalName + 'Service'; %>
+<% var controllerName = modulePascalName + 'Controller'; %>
+<% var compiledName = modulePascalName + 'RPC'; %>
+<% var serviceName = modulePascalName + 'Service'; %>
+<% var prefix = pluralize(_.kebabCase(moduleName).toLowerCase()); %>
 ---
-filePath: <%= getModulePath(segmentName, moduleName, ControllerName + '.ts') %> # Relative to "modules" dir
-sourceName: <%= ControllerName %> # Used to define import declaration in a segment route file for the given class
-compiledName: <%= RPCName %> # Used to define a compiled object name
+dir: <%= getModuleDirName(segmentName, moduleName) %>
+fileName: <%= controllerName + '.ts' %>
+sourceName: <%= controllerName %>
+compiledName: <%= compiledName %>
 ---
 
-import { prefix, get, put, post, del<%= !config.validationLibrary ? ', type VovkRequest' : '' %> } from 'vovk';
+import { prefix, get, put, post, del, type VovkRequest } from 'vovk';
 <% if(withService) { %>
-import <%= ServiceName %> from './<%= ServiceName %>';
+import <%= serviceName %> from './<%= serviceName %>';
 <% } %>
 
-@prefix('<%= _.kebabCase(moduleName).toLowerCase() %>')
-export default class <%= ControllerName %> {
+@prefix('<%= prefix %>')
+export default class <%= controllerName %> {
     @get()
-    static get<%= modulePascalNamePlural %> = async (req: VovkRequest<null, { q: string }>) => {
-        const q = req.nextUrl.searchParams.get('q');
+    static get<%= modulePascalNamePlural %> = async (req: VovkRequest<null, { search: string }>) => {
+        const search = req.nextUrl.searchParams.get('search');
         <% if(withService) { %>
-        return <%= ServiceName %>.getMyThingsExample(q);
+        return <%= serviceName %>.get<%= modulePascalNamePlural %>(search);
         <% } else { %>
-        return { q };
+        return { results: [], search };
         <% } %>
     }
 
     @put(':id')
-    static update<%= modulePascalNamePlural %> = async (req: VovkRequest<{ foo: 'bar' | 'baz' }, { q: string }>, params: { id: string }) => {
+    static update<%= modulePascalName %> = async (req: VovkRequest<{ foo: 'bar' | 'baz' }, { q: string }>, params: { id: string }) => {
         const { id } = params;
         const body = await req.json();
         const q = req.nextUrl.searchParams.get('q');
         <% if(withService) { %>
-        return MyThingService.updateMyThingExample(id, q, body);
+        return <%= serviceName %>.update<%= modulePascalName %>(id, q, body);
         <% } else { %>
         return { id, body, q };
         <% } %>
     };
 
     @post()
-    static create<%= modulePascalNamePlural %> = () => {
+    static create<%= modulePascalName %> = () => {
         // ...
     };
 
     @del(':id')
-    static delete<%= modulePascalNamePlural %> = () => {
+    static delete<%= modulePascalName %> = () => {
         // ...
     };
 }