vovk-cli 0.0.1-draft.12 → 0.0.1-draft.13

package/dist/generateClient.d.mts

@@ -1,6 +1,6 @@
+import type { VovkSchema } from 'vovk';
 import type { ProjectInfo } from './getProjectInfo/index.mjs';
 import type { Segment } from './locateSegments.mjs';
-import type { VovkSchema } from 'vovk';
 export default function generateClient(projectInfo: ProjectInfo, segments: Segment[], segmentsSchema: Record<string, VovkSchema>): Promise<{
     written: boolean;
     path: string;

package/dist/generateClient.mjs

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import formatLoggedSegmentName from './utils/formatLoggedSegmentName.mjs';
 import prettify from './utils/prettify.mjs';
 export default async function generateClient(projectInfo, segments, segmentsSchema) {

package/dist/getProjectInfo/getConfigAbsolutePaths.mjs

@@ -1,5 +1,5 @@
-import fs from 'fs/promises';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 export default async function getConfigAbsolutePaths({ cwd, relativePath, }) {
     const rootDir = path.resolve(cwd, relativePath || '');
     const baseName = 'vovk.config';

package/dist/getProjectInfo/getRelativeSrcRoot.mjs

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 export default async function getRelativeSrcRoot({ cwd }) {
     // Next.js Docs: src/app or src/pages will be ignored if app or pages are present in the root directory.

package/dist/getProjectInfo/index.mjs

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import getConfig from './getConfig.mjs';
 import getLogger from '../utils/getLogger.mjs';
 export default async function getProjectInfo({ port: givenPort, clientOutDir, cwd = process.cwd(), } = {}) {

package/dist/index.d.mts

@@ -1,30 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
-import type { LogLevelNames } from 'loglevel';
 import type { VovkConfig, VovkEnv } from './types.mjs';
 import 'dotenv/config';
 export type { VovkConfig, VovkEnv };
-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' | 'dev';
-}
-export interface NewOptions {
-    dryRun?: boolean;
-    template?: string;
-    dir?: string;
-    overwrite?: boolean;
-    noSegmentUpdate?: boolean;
-}
 declare const program: Command;
 export declare function initProgram(p: typeof program, command: string): Command;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import path from 'path';
+import path from 'node:path';
+import { readFileSync } from 'node:fs';
 import { Command } from 'commander';
-import { readFileSync } from 'fs';
 import concurrently from 'concurrently';
 import getAvailablePort from './utils/getAvailablePort.mjs';
 import getProjectInfo from './getProjectInfo/index.mjs';
@@ -25,12 +25,15 @@ program
     const PORT = !options.nextDev
         ? process.env.PORT
         : process.env.PORT ||
-            (await getAvailablePort(3000, portAttempts, 0, (failedPort, tryingPort) => console.warn(`🐺 Next.js Port ${failedPort} is in use, trying ${tryingPort} instead.`)).catch(() => {
+            (await getAvailablePort(3000, portAttempts, 0, (failedPort, tryingPort) => 
+            // eslint-disable-next-line no-console
+            console.warn(`🐺 Next.js Port ${failedPort} is in use, trying ${tryingPort} instead.`)).catch(() => {
                 throw new Error(`🐺 ❌ Failed to find available Next port after ${portAttempts} attempts`);
             }));
     if (!PORT) {
         throw new Error('🐺 ❌ PORT env variable is required');
     }
+    console.log(`TODO:`, command.args);
     if (options.nextDev) {
         const { result } = concurrently([
             {
@@ -75,7 +78,7 @@ export function initProgram(p, command) {
     return p
         .command(command + '[prefix]')
         .description('Initialize Vovk project')
-        .option('-Y, --yes', 'Skip all prompts and use default values')
+        .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')
@@ -95,8 +98,8 @@ program
     .command('new [components...]')
     .alias('n')
     .description('Create new components. "vovk new [...components] [segmentName/]moduleName" to create a new module or "vovk new segment [segmentName]" to create a new segment')
-    .option('-O, --overwrite', 'Overwrite existing files')
-    .option('--template <template>', 'Override config template')
+    .option('-o, --overwrite', 'Overwrite existing files')
+    .option('--template, --templates <templates...>', 'Override config template. Accepts an array of strings that correspond the order of the components')
     .option('--dir <dirname>', 'Override dirName in template file. Relative to the root of the project')
     .option('--no-segment-update', 'Do not update segment files when creating a new module')
     .option('--dry-run', 'Do not write files to disk')

package/dist/init/checkTSConfigForExperimentalDecorators.mjs

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import * as jsonc from 'jsonc-parser';
 export default async function checkTSConfigForExperimentalDecorators(root) {
     const tsconfigPath = path.resolve(root, 'tsconfig.json');

package/dist/init/createConfig.d.mts

@@ -1,5 +1,5 @@
 import type getLogger from '../utils/getLogger.mjs';
-import type { InitOptions } from '../index.mjs';
+import type { InitOptions } from '../types.mjs';
 export default function createConfig({ root, log, dryRun, options: { validationLibrary, validateOnClient }, }: {
     root: string;
     log: ReturnType<typeof getLogger>;

package/dist/init/createConfig.mjs

@@ -1,8 +1,8 @@
-import path from 'path';
-import fs from 'fs/promises';
-import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import getTemplateFilesFromPackage from './getTemplateFilesFromPackage.mjs';
 import prettify from '../utils/prettify.mjs';
+import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 export default async function createConfig({ root, log, dryRun, options: { validationLibrary, validateOnClient }, }) {
     const config = {};
     const dotConfigPath = path.join(root, '.config');

package/dist/init/getTemplateFilesFromPackage.mjs

@@ -1,6 +1,6 @@
-import { createGunzip } from 'zlib';
+import { Readable } from 'node:stream';
+import { createGunzip } from 'node:zlib';
 import tar from 'tar-stream';
-import { Readable } from 'stream';
 import getNPMPackageMetadata from '../utils/getNPMPackageMetadata.mjs';
 /**
  * Retrieves a list of files in the 'templates' folder of an NPM package.

package/dist/init/index.d.mts

@@ -1,5 +1,4 @@
-#!/usr/bin/env node
-import type { InitOptions } from '../index.mjs';
+import type { InitOptions } from '../types.mjs';
 import getLogger from '../utils/getLogger.mjs';
 export declare class Init {
     #private;

package/dist/init/index.mjs

@@ -1,64 +1,6 @@
-#!/usr/bin/env node
-/*
-npx vovk-cli init
-- Check if the project is already initialized
-  - Do you want to reinitialize the project?
-    - Yes
-    - No (exit)
-- Check for package.json, if not found, show error and exit
-- Check for tsconfig.json, if not found, show error and exit
-- Check Next.js installed
-- Choose validation library: add to the installation list
-    - vovk-zod
-        - Further installation notes: install zod
-    - vovk-yup
-        - Further installation notes: install yup
-    - vovk-dto
-        - Further installation notes: install class-validator and class-transformer
-    - None
-- If validation library is not None,
-    - Do you want to enable client validation?
-        - Yes
-            - Add client validation to the config
-        - No
-- Do you want to update NPM scripts?
-    - Yes
-        - Update NPM scripts
-    - No
-- Do you want to use explicit concurrently?
-    - Yes (recommended)
-        - Add concurrently to the installation list
-    - No
-- if experimentalDecorators is not found in tsconfig.json,
-    - Do you want to add experimentalDecorators to tsconfig.json?
-        - Yes
-            - Add experimentalDecorators to tsconfig.json
-        - No
-- Do you want to create route file with example service and controller? (NO NEED)
-    - Yes
-        - Create route file with example controller
-    - No, I will create it myself
-- End
-    - If there are any packages to install, install them
-    - Show installation notes
-    - If there are any files to create, create
-    - If there are any config files to update, update
-    - If example route file is NOT created, show example route file and controller
-    - Show how to run the project
-        - If npm scripts are updated
-            - npm run dev
-        - If npm scripts are NOT updated
-            - If concurrently is installed
-                - concurrently "vovk dev" "next dev"
-            - If concurrently is NOT installed
-                - vovk dev --next-dev
-        - Open http://localhost:3000/api/hello-world
-        - Show how to make a request to the example route
-    - Show success message
-*/
 import { confirm, select } from '@inquirer/prompts';
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import getConfigPaths from '../getProjectInfo/getConfigAbsolutePaths.mjs';
 import chalk from 'chalk';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';

package/dist/init/installDependencies.d.mts

@@ -1,5 +1,5 @@
-import { InitOptions } from '../index.mjs';
 import getLogger from '../utils/getLogger.mjs';
+import type { InitOptions } from '../types.mjs';
 type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
 export declare function getPackageManager(options: Pick<InitOptions, 'useNpm' | 'useYarn' | 'usePnpm' | 'useBun'>): PackageManager;
 export default function installDependencies({ log, cwd, options, }: {

package/dist/init/installDependencies.mjs

@@ -1,4 +1,4 @@
-import { spawn } from 'child_process';
+import { spawn } from 'node:child_process';
 export function getPackageManager(options) {
     if (options.useNpm)
         return 'npm';

package/dist/init/logUpdateDependenciesError.d.mts

@@ -1,5 +1,5 @@
-import getLogger from "../utils/getLogger.mjs";
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error }: {
+import type getLogger from '../utils/getLogger.mjs';
+export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, }: {
     useNpm?: boolean;
     useYarn?: boolean;
     usePnpm?: boolean;

package/dist/init/logUpdateDependenciesError.mjs

@@ -1,6 +1,6 @@
-import chalkHighlightThing from "../utils/chalkHighlightThing.mjs";
-import { getPackageManager } from "./installDependencies.mjs";
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error }) {
+import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
+import { getPackageManager } from './installDependencies.mjs';
+export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, }) {
     const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
     const installCommands = [];
     if (dependencies.length > 0) {

package/dist/init/updateDependenciesWithoutInstalling.d.mts

@@ -1,8 +1,9 @@
-import getLogger from '../utils/getLogger.mjs';
+import type getLogger from '../utils/getLogger.mjs';
+import { InitOptions } from '../types.mjs';
 export default function updateDependenciesWithoutInstalling({ log, dir, dependencyNames, devDependencyNames, channel, }: {
     log: ReturnType<typeof getLogger>;
     dir: string;
     dependencyNames: string[];
     devDependencyNames: string[];
-    channel: 'latest' | 'beta' | 'dev';
+    channel: InitOptions['channel'];
 }): Promise<void>;

package/dist/init/updateDependenciesWithoutInstalling.mjs

@@ -1,14 +1,14 @@
-import fs from 'fs/promises';
-import getNPMPackageMetadata from '../utils/getNPMPackageMetadata.mjs';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import chalk from 'chalk';
+import getNPMPackageMetadata from '../utils/getNPMPackageMetadata.mjs';
 async function updateDeps({ packageJson, packageNames, channel, key, }) {
     return Promise.all(packageNames.map(async (packageName) => {
         if (packageJson[key]?.[packageName])
             return; // Skip if already present
         const metadata = await getNPMPackageMetadata(packageName);
         const isVovk = packageName.startsWith('vovk');
-        const latestVersion = metadata['dist-tags'][isVovk ? channel : 'latest'];
+        const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
         if (!packageJson[key]) {
             packageJson[key] = {};
         }

package/dist/init/updateTypeScriptConfig.mjs

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import * as jsonc from 'jsonc-parser';
 import prettify from '../utils/prettify.mjs';
 export default async function updateTypeScriptConfig(root) {

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 = [];

package/dist/new/addClassToSegmentCode.mjs

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

package/dist/new/index.d.mts

@@ -1,2 +1,2 @@
-import type { NewOptions } from '../index.mjs';
-export default function newComponents(components: string[], { dryRun, dir, template, overwrite, noSegmentUpdate }: 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,6 +1,6 @@
 import newModule from './newModule.mjs';
 import newSegment from './newSegment.mjs';
-export default async function newComponents(components, { dryRun, dir, template, overwrite, noSegmentUpdate }) {
+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
@@ -27,7 +27,7 @@ export default async function newComponents(components, { dryRun, dir, template,
             what,
             moduleNameWithOptionalSegment,
             dir,
-            template,
+            templates,
             overwrite,
             noSegmentUpdate,
             dryRun,

package/dist/new/newModule.d.mts

@@ -1,9 +1,9 @@
-export default function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirNameFlag, template: templateFlag, noSegmentUpdate, overwrite, }: {
+export default function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirNameFlag, templates: templatesFlag, noSegmentUpdate, overwrite, }: {
     what: string[];
     moduleNameWithOptionalSegment: string;
     dryRun?: boolean;
     dir?: string;
-    template?: 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, dir: dirNameFlag, template: templateFlag, noSegmentUpdate, overwrite, }) {
+export default async function newModule({ what, moduleNameWithOptionalSegment, dryRun, dir: dirNameFlag, 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,28 +35,27 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
                 return s;
         }
     });
-    console.log('moduleNameWithOptionalSegment', moduleNameWithOptionalSegment);
-    console.log('what', what);
-    if (templateFlag) {
-        if (what.length > 1) {
-            throw new Error('Cannot use --template flag with multiple types');
+    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);
     }
-    else {
-        // check if template exists
-        for (const type of what) {
-            if (!templates[type]) {
-                throw new Error(`Template for ${type} not found in config`);
-            }
+    for (const type of what) {
+        if (!templates[type]) {
+            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 = templateFlag ?? templates[type];
+        const templatePath = templates[type];
         const templateAbsolutePath = templatePath.startsWith('/') || templatePath.startsWith('.')
             ? path.resolve(cwd, templatePath)
             : path.resolve(cwd, './node_modules', templatePath);
@@ -68,7 +67,14 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             segmentName,
             moduleName,
         });
-        const absoluteModuleDir = path.join(cwd, dirNameFlag || renderedDirName);
+        const dirName = dirNameFlag || renderedDirName;
+        if (!dirName) {
+            throw new Error(`The template for "${type}" does not provide a dirName`);
+        }
+        if (!fileName) {
+            throw new Error(`The template for "${type}" does not provide a fileName`);
+        }
+        const absoluteModuleDir = path.join(cwd, dirName);
         const absoluteModulePath = path.join(absoluteModuleDir, fileName);
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
@@ -78,31 +84,31 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             else {
                 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('sourceName is required');
+                throw new Error(`The template for "${type}" does not provide a sourceName`);
             }
             if (!compiledName) {
-                throw new Error('compiledName is required');
+                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(path.dirname(routeFilePath), absoluteModulePath).replace(/\.(ts|tsx)$/, '');
             if (!noSegmentUpdate) {
-                const newSegmentCode = addClassToSegmentCode(segmentSourceCode, {
+                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(fileName)} using "${chalkHighlightThing(type)}" template for ${formatLoggedSegmentName(segmentName)}`);
     }
 }

package/dist/new/newSegment.mjs

@@ -1,5 +1,5 @@
-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';
@@ -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'].filter(Boolean).join('/')}`)} to create a controller.`);
+    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} created at ${absoluteSegmentRoutePath}. Run ${chalkHighlightThing(`vovk new controller ${[segmentName, 'someName'].filter(Boolean).join('/')}`)} to create a new controller`);
 }

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.

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;
@@ -44,3 +44,32 @@ export type VovkModuleRenderResult = {
     compiledName?: string;
     code: string;
 };
+export interface DevOptions {
+    clientOut?: string;
+    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/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';
+// TODO check comments
 /**
  * Checks if a port is available.
  * @param {number} port - The port to check.

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/dist/watcher/diffSchema.d.mts

@@ -1,5 +1,5 @@
 import type { VovkSchema } from 'vovk';
-import { _VovkControllerSchema, _VovkWorkerSchema } from 'vovk/types';
+import type { _VovkControllerSchema, _VovkWorkerSchema } from 'vovk/types';
 interface HandlersDiff {
     nameOfClass: string;
     added: string[];

package/dist/watcher/ensureClient.d.mts

@@ -0,0 +1,5 @@
+import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+export default function ensureClient(projectInfo: ProjectInfo): Promise<{
+    written: boolean;
+    path: string;
+}>;

package/dist/watcher/ensureClient.mjs

@@ -0,0 +1,31 @@
+import path from 'node:path';
+import fs from 'node:fs/promises';
+export default async function ensureClient(projectInfo) {
+    const { config, cwd, log } = projectInfo;
+    const now = Date.now();
+    const clientoOutDirAbsolutePath = path.join(cwd, config.clientOutDir);
+    const dts = `// auto-generated
+// This is a temporary placeholder to avoid errors if client is imported before it's generated.
+// If you still see this text, the client is not generated yet because of an unknown problem.
+// Feel free to report an issue at https://github.com/finom/vovk/issues`;
+    const js = dts;
+    const ts = dts;
+    const localJsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.js');
+    const localDtsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.d.ts');
+    const localTsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'index.ts');
+    const existingJs = await fs.readFile(localJsAbsolutePath, 'utf-8').catch(() => null);
+    const existingDts = await fs.readFile(localDtsAbsolutePath, 'utf-8').catch(() => null);
+    const existingTs = await fs.readFile(localTsAbsolutePath, 'utf-8').catch(() => null);
+    if (existingJs && existingDts && existingTs) {
+        return { written: false, path: clientoOutDirAbsolutePath };
+    }
+    await fs.mkdir(clientoOutDirAbsolutePath, { recursive: true });
+    if (!existingJs)
+        await fs.writeFile(localJsAbsolutePath, js);
+    if (!existingDts)
+        await fs.writeFile(localDtsAbsolutePath, dts);
+    if (!existingTs)
+        await fs.writeFile(localTsAbsolutePath, ts);
+    log.info(`Empty client files are generated in ${Date.now() - now}ms`);
+    return { written: true, path: clientoOutDirAbsolutePath };
+}

package/dist/watcher/ensureSchemaFiles.mjs

@@ -1,5 +1,5 @@
-import fs from 'fs/promises';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import debounce from 'lodash/debounce.js';
 import writeOneSchemaFile, { ROOT_SEGMENT_SCHEMA_NAME } from './writeOneSchemaFile.mjs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';

package/dist/watcher/index.mjs

@@ -1,19 +1,20 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import * as chokidar from 'chokidar';
-import fs from 'fs/promises';
-import getProjectInfo from '../getProjectInfo/index.mjs';
-import path from 'path';
+import { Agent, setGlobalDispatcher } from 'undici';
+import keyBy from 'lodash/keyBy.js';
+import capitalize from 'lodash/capitalize.js';
+import debounce from 'lodash/debounce.js';
+import isEmpty from 'lodash/isEmpty.js';
 import { debouncedEnsureSchemaFiles } from './ensureSchemaFiles.mjs';
 import writeOneSchemaFile from './writeOneSchemaFile.mjs';
 import logDiffResult from './logDiffResult.mjs';
+import ensureClient from './ensureClient.mjs';
+import getProjectInfo from '../getProjectInfo/index.mjs';
 import generateClient from '../generateClient.mjs';
 import locateSegments from '../locateSegments.mjs';
 import debounceWithArgs from '../utils/debounceWithArgs.mjs';
-import debounce from 'lodash/debounce.js';
-import isEmpty from 'lodash/isEmpty.js';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
-import keyBy from 'lodash/keyBy.js';
-import capitalize from 'lodash/capitalize.js';
-import { Agent, setGlobalDispatcher } from 'undici';
 export class VovkCLIWatcher {
     #projectInfo;
     #segments = [];
@@ -27,7 +28,7 @@ export class VovkCLIWatcher {
         const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
         const apiDirAbsolutePath = path.join(cwd, apiDir);
         const getSegmentName = (filePath) => path.relative(apiDirAbsolutePath, filePath).replace(segmentReg, '');
-        log.debug(`Watching segments in ${apiDirAbsolutePath}`);
+        log.debug(`Watching segments at ${apiDirAbsolutePath}`);
         this.#segmentWatcher = chokidar
             .watch(apiDirAbsolutePath, {
             persistent: true,
@@ -85,7 +86,7 @@ export class VovkCLIWatcher {
     #watchModules = () => {
         const { config, cwd, log } = this.#projectInfo;
         const modulesDirAbsolutePath = path.join(cwd, config.modulesDir);
-        log.debug(`Watching modules in ${modulesDirAbsolutePath}`);
+        log.debug(`Watching modules at ${modulesDirAbsolutePath}`);
         const processControllerChange = debounceWithArgs(this.#processControllerChange, 500);
         this.#modulesWatcher = chokidar
             .watch(modulesDirAbsolutePath, {
@@ -156,11 +157,12 @@ export class VovkCLIWatcher {
             .on('error', (error) => log.error(`Error watching config files: ${error?.message ?? 'Unknown error'}`));
         void handle();
     };
-    #watch() {
+    async #watch() {
         if (this.#isWatching)
             throw new Error('Already watching');
         const { log } = this.#projectInfo;
         log.debug(`Starting segments and modules watcher. Detected initial segments: ${JSON.stringify(this.#segments.map((s) => s.segmentName))}.`);
+        await ensureClient(this.#projectInfo);
         // automatically watches segments and modules
         this.#watchConfig();
     }

package/dist/watcher/logDiffResult.d.mts

@@ -1,3 +1,3 @@
-import { ProjectInfo } from '../getProjectInfo/index.mjs';
-import { DiffResult } from './diffSchema.mjs';
+import type { DiffResult } from './diffSchema.mjs';
+import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 export default function logDiffResult(segmentName: string, diffResult: DiffResult, projectInfo: ProjectInfo): void;

package/dist/watcher/logDiffResult.mjs

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 export default function logDiffResult(segmentName, diffResult, projectInfo) {
@@ -37,48 +38,51 @@ export default function logDiffResult(segmentName, diffResult, projectInfo) {
         });
     });
     const LIMIT = diffNormalized.length < 12 ? diffNormalized.length : 10;
+    const addedText = chalk.green('added');
+    const removedText = chalk.red('removed');
+    const changedText = chalk.cyan('changed');
     for (const diffNormalizedItem of diffNormalized.slice(0, LIMIT)) {
         switch (diffNormalizedItem.what) {
             case 'worker':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'controller':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'workerHandler':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'controllerHandler':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'changed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been changed at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${changedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;

package/dist/watcher/writeOneSchemaFile.d.mts

@@ -1,5 +1,5 @@
 import type { VovkSchema } from 'vovk';
-import { DiffResult } from './diffSchema.mjs';
+import { type DiffResult } from './diffSchema.mjs';
 export declare const ROOT_SEGMENT_SCHEMA_NAME = "_root";
 export default function writeOneSchemaFile({ schemaOutAbsolutePath, schema, skipIfExists, }: {
     schemaOutAbsolutePath: string;

package/dist/watcher/writeOneSchemaFile.mjs

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import diffSchema from './diffSchema.mjs';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 export const ROOT_SEGMENT_SCHEMA_NAME = '_root';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.12",
+  "version": "0.0.1-draft.13",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -14,6 +14,7 @@
     "pre-test": "npm run build && chmod +x ./dist/index.mjs && 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"
   },
@@ -34,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.12"
+    "vovk": "^3.0.0-draft.13"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.0.1",
@@ -63,7 +64,7 @@
     "@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.2",
     "node-pty": "^1.0.0",
     "type-fest": "^4.26.1"
   }

package/templates/controller.ejs

@@ -18,12 +18,12 @@ import <%= serviceName %> from './<%= serviceName %>';
 @prefix('<%= _.kebabCase(moduleName).toLowerCase() %>')
 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 %>.get<%= modulePascalNamePlural %>(q);
+        return <%= serviceName %>.get<%= modulePascalNamePlural %>(search);
         <% } else { %>
-        return { q };
+        return { results: [], search };
         <% } %>
     }
 
@@ -33,7 +33,7 @@ export default class <%= controllerName %> {
         const body = await req.json();
         const q = req.nextUrl.searchParams.get('q');
         <% if(withService) { %>
-        return MyThingService.update<%= modulePascalName %>(id, q, body);
+        return <%= serviceName %>.update<%= modulePascalName %>(id, q, body);
         <% } else { %>
         return { id, body, q };
         <% } %>

package/templates/service.ejs

@@ -11,14 +11,14 @@ import type { VovkControllerBody, VovkControllerQuery } from 'vovk';
 import type <%= controllerName %> from './<%= controllerName %>';
 
 export default class <%= serviceName %> {
-  static get<%= modulePascalNamePlural %> = (q: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>['q']) => {
-    return [];
+  static get<%= modulePascalNamePlural %> = (search: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalNamePlural %>>['search']) => {
+    return { results: [], search };
   };
 
   static update<%= modulePascalName %> = (
     id: string,
-    q: VovkControllerQuery<typeof <%= controllerName %>.get<%= modulePascalName %>>['q'],
-    body: VovkControllerBody<typeof <%= controllerName %>.get<%= modulePascalName %>>
+    q: VovkControllerQuery<typeof <%= controllerName %>.update<%= modulePascalName %>>['q'],
+    body: VovkControllerBody<typeof <%= controllerName %>.update<%= modulePascalName %>>
   ) => {
     return { id, q, body };
   };