vovk-cli 0.0.1-draft.7 → 0.0.1-draft.70

package/dist/init/index.mjs

@@ -1,81 +1,26 @@
-#!/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';
-import installDependencies from './installDependencies.mjs';
+import installDependencies, { getPackageManager } from './installDependencies.mjs';
 import getLogger from '../utils/getLogger.mjs';
 import createConfig from './createConfig.mjs';
-import updateNPMScripts from './updateNPMScripts.mjs';
+import updateNPMScripts, { getDevScript } from './updateNPMScripts.mjs';
 import checkTSConfigForExperimentalDecorators from './checkTSConfigForExperimentalDecorators.mjs';
 import updateTypeScriptConfig from './updateTypeScriptConfig.mjs';
 import updateDependenciesWithoutInstalling from './updateDependenciesWithoutInstalling.mjs';
+import logUpdateDependenciesError from './logUpdateDependenciesError.mjs';
+import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
+import NPMCliPackageJson from '@npmcli/package-json';
 export class Init {
     root;
     log;
-    async #init({ configPaths, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, dryRun, channel, }) {
+    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, reactQuery, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk'];
-        const devDependencies = ['vovk-cli'];
+        const dependencies = ['vovk', 'vovk-client'];
+        const devDependencies = ['vovk-cli', 'openapi3-ts'];
         // delete older config files
         if (configPaths.length) {
             await Promise.all(configPaths.map((configPath) => fs.rm(configPath)));
@@ -86,13 +31,17 @@ export class Init {
             dependencies.push(...({
                 'vovk-zod': ['zod'],
                 'vovk-yup': ['yup'],
-                'vovk-dto': ['class-validator', 'class-transformer'],
+                'vovk-dto': ['class-validator', 'class-transformer', 'vovk-mapped-types', 'reflect-metadata'],
             }[validationLibrary] ?? []));
         }
+        if (reactQuery) {
+            dependencies.push('vovk-react-query');
+            dependencies.push('@tanstack/react-query');
+        }
         if (updateScripts) {
             try {
                 if (!dryRun)
-                    await updateNPMScripts(root, updateScripts);
+                    await updateNPMScripts(pkgJson, root, updateScripts);
                 log.info('Updated scripts at package.json');
             }
             catch (error) {
@@ -113,6 +62,7 @@ export class Init {
             }
         }
         if (!dryRun) {
+            let depsUpdated = false;
             try {
                 await updateDependenciesWithoutInstalling({
                     log,
@@ -121,27 +71,34 @@ export class Init {
                     devDependencyNames: devDependencies,
                     channel: channel ?? 'latest',
                 });
-                log.info('Updated dependencies and devDependencies in package.json');
+                depsUpdated = true;
             }
-            catch (error) {
-                log.error(`Failed to update dependencies: ${error.message}. Please `);
+            catch (e) {
+                const error = e;
+                logUpdateDependenciesError({ log, error, useNpm, useYarn, usePnpm, useBun, dependencies, devDependencies });
             }
-            if (!skipInstall) {
-                try {
-                    await installDependencies({
-                        log,
-                        cwd: root,
-                        options: {
-                            useNpm,
-                            useYarn,
-                            usePnpm,
-                            useBun,
-                        },
-                    });
-                    log.info('Dependencies installed successfully');
+            if (depsUpdated) {
+                const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
+                if (skipInstall) {
+                    log.info(`Installation skipped. Please, install them manually with ${chalkHighlightThing(packageManager + ' install')}`);
                 }
-                catch (error) {
-                    log.error(`Failed to install dependencies: ${error.message}`);
+                else {
+                    try {
+                        await installDependencies({
+                            log,
+                            cwd: root,
+                            options: {
+                                useNpm,
+                                useYarn,
+                                usePnpm,
+                                useBun,
+                            },
+                        });
+                        log.info('Dependencies installed successfully');
+                    }
+                    catch (error) {
+                        log.warn(`Failed to install dependencies: ${error.message}. Please, install them manually with ${chalkHighlightThing(packageManager + ' install')}`);
+                    }
                 }
             }
         }
@@ -149,8 +106,7 @@ export class Init {
             const { configAbsolutePath } = await createConfig({
                 root,
                 log,
-                options: { validationLibrary, validateOnClient },
-                dryRun,
+                options: { validationLibrary, validateOnClient, reactQuery, channel, dryRun },
             });
             log.info('Config created successfully at ' + configAbsolutePath);
         }
@@ -158,15 +114,16 @@ export class Init {
             log.error(`Failed to create config: ${error.message}`);
         }
     }
-    async main(prefix, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, dryRun, channel, }) {
+    async main(prefix, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, reactQuery, dryRun, channel, }) {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix);
         const log = getLogger(logLevel);
+        const pkgJson = await NPMCliPackageJson.load(root);
         this.root = root;
         this.log = log;
         const configPaths = await getConfigPaths({ cwd, relativePath: prefix });
         if (yes) {
-            return this.#init({ configPaths }, {
+            return this.#init({ configPaths, pkgJson }, {
                 useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
                 useYarn: useYarn ?? false,
                 usePnpm: usePnpm ?? false,
@@ -176,6 +133,7 @@ export class Init {
                 updateScripts: updateScripts ?? 'implicit',
                 validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'vovk-zod'),
                 validateOnClient: validateOnClient ?? true,
+                reactQuery: reactQuery ?? true,
                 dryRun: dryRun ?? false,
                 channel: channel ?? 'latest',
             });
@@ -213,7 +171,7 @@ export class Init {
                             {
                                 name: 'vovk-dto',
                                 value: 'vovk-dto',
-                                description: 'Use class-validator and class-transformer for data validation',
+                                description: 'Use class-validator for data validation. Also installs class-transformer, vovk-mapped-types and reflect-metadata',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
@@ -228,41 +186,46 @@ export class Init {
         updateScripts =
             updateScripts ??
                 (await select({
-                    message: 'Do you want to update package.json by adding "generate" and "dev" scripts?',
+                    message: 'Do you want to update package.json by adding "generate" and updating "dev" NPM scripts?',
                     default: 'implicit',
                     choices: [
                         {
                             name: 'Yes, use "concurrently" implicitly',
-                            description: `The "dev" script will use "concurrently" API internally in order to run "next dev" and "vovk dev" together and automatically look for an available port ${chalk.whiteBright.bold(`"vovk dev --next-dev"`)}`,
                             value: 'implicit',
+                            description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)}`,
                         },
                         {
                             name: 'Yes, use "concurrently" explicitly',
                             value: 'explicit',
-                            description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"PORT=3000 concurrently 'vovk dev' 'next dev' --kill-others"`)}`,
+                            description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)}`,
                         },
                         {
                             name: 'No',
                             value: undefined,
-                            description: 'Add the scripts manually',
+                            description: 'Add the NPM scripts manually',
                         },
                     ],
                 }));
+        reactQuery =
+            reactQuery ??
+                (await confirm({
+                    message: 'Do you want to use @tanstack/react-query for data fetching at React components?',
+                }));
         if (typeof updateTsConfig === 'undefined') {
             let shouldAsk = false;
             try {
                 shouldAsk = !(await checkTSConfigForExperimentalDecorators(root));
             }
             catch (error) {
-                log.error(`Failed to check tsconfig.json for experimentalDecorators: ${error.message}`);
+                log.error(`Failed to check tsconfig.json for "experimentalDecorators": ${error.message}`);
             }
             if (shouldAsk) {
                 updateTsConfig = await confirm({
-                    message: 'Do you want to add experimentalDecorators to tsconfig.json?',
+                    message: 'Do you want to add "experimentalDecorators" option to tsconfig.json?',
                 });
             }
         }
-        await this.#init({ configPaths }, {
+        await this.#init({ configPaths, pkgJson }, {
             useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
             useYarn: useYarn ?? false,
             usePnpm: usePnpm ?? false,
@@ -272,6 +235,7 @@ export class Init {
             updateScripts,
             validationLibrary,
             validateOnClient,
+            reactQuery,
             dryRun,
             channel,
         });

package/dist/init/installDependencies.d.mts

@@ -1,7 +1,10 @@
-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, }: {
     log: ReturnType<typeof getLogger>;
     cwd: string;
     options: Pick<InitOptions, 'useNpm' | 'useYarn' | 'usePnpm' | 'useBun'>;
 }): Promise<void>;
+export {};

package/dist/init/installDependencies.mjs

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

package/dist/init/logUpdateDependenciesError.d.mts

@@ -0,0 +1,11 @@
+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;
+    useBun?: boolean;
+    log: ReturnType<typeof getLogger>;
+    dependencies: string[];
+    devDependencies: string[];
+    error: Error;
+}): void;

package/dist/init/logUpdateDependenciesError.mjs

@@ -0,0 +1,45 @@
+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) {
+        let depInstallCmd = '';
+        switch (packageManager) {
+            case 'npm':
+                depInstallCmd = `npm install ${dependencies.join(' ')}`;
+                break;
+            case 'yarn':
+                depInstallCmd = `yarn add ${dependencies.join(' ')}`;
+                break;
+            case 'pnpm':
+                depInstallCmd = `pnpm add ${dependencies.join(' ')}`;
+                break;
+            case 'bun':
+                depInstallCmd = `bun add ${dependencies.join(' ')}`;
+                break;
+        }
+        installCommands.push(depInstallCmd);
+    }
+    if (devDependencies.length > 0) {
+        let devDepInstallCmd = '';
+        switch (packageManager) {
+            case 'npm':
+                devDepInstallCmd = `npm install -D ${devDependencies.join(' ')}`;
+                break;
+            case 'yarn':
+                devDepInstallCmd = `yarn add --dev ${devDependencies.join(' ')}`;
+                break;
+            case 'pnpm':
+                devDepInstallCmd = `pnpm add -D ${devDependencies.join(' ')}`;
+                break;
+            case 'bun':
+                devDepInstallCmd = `bun add -d ${devDependencies.join(' ')}`;
+                break;
+        }
+        installCommands.push(devDepInstallCmd);
+    }
+    const installCmd = installCommands.join(' && ');
+    // Log the error with the appropriate manual installation instructions
+    log.warn(`Failed to update dependencies: ${error.message}. Please, install them manually with ${chalkHighlightThing(installCmd)}`);
+}

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,13 +1,12 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import chalk from 'chalk';
 import getNPMPackageMetadata from '../utils/getNPMPackageMetadata.mjs';
-import path from 'path';
 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 isVovk = packageName.startsWith('vovk') && packageName !== 'vovk-mapped-types';
+        const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
         if (!packageJson[key]) {
             packageJson[key] = {};
         }
@@ -18,8 +17,14 @@ export default async function updateDependenciesWithoutInstalling({ log, dir, de
     const packageJsonPath = path.join(dir, 'package.json');
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'));
     await updateDeps({ packageJson, packageNames: dependencyNames, channel, key: 'dependencies' });
-    log.debug('Updated dependencies in package.json');
     await updateDeps({ packageJson, packageNames: devDependencyNames, channel, key: 'devDependencies' });
-    log.debug('Updated devDependencies in package.json');
     await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    log.info('Added dependencies to package.json:');
+    for (const dependency of dependencyNames) {
+        log.raw.info(` - ${chalk.cyan(dependency)}`);
+    }
+    log.info('Added devDependencies to package.json:');
+    for (const dependency of devDependencyNames) {
+        log.raw.info(` - ${chalk.cyan(dependency)}`);
+    }
 }

package/dist/init/updateNPMScripts.d.mts

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

package/dist/init/updateNPMScripts.mjs

@@ -1,12 +1,16 @@
-import NPMCliPackageJson from '@npmcli/package-json';
-export default async function updateNPMScripts(root, updateScriptsMode) {
-    const pkgJson = await NPMCliPackageJson.load(root);
+export function getDevScript(pkgJson, updateScriptsMode) {
+    const nextDev = pkgJson.content.scripts?.dev ?? 'next dev';
+    const nextDevFlags = nextDev.replace('next dev', '').trim();
+    return updateScriptsMode === 'explicit'
+        ? `PORT=3000 concurrently '${nextDev}' 'vovk dev' --kill-others`
+        : `vovk dev --next-dev${nextDevFlags ? ` -- ${nextDevFlags}` : ''}`;
+}
+export default async function updateNPMScripts(pkgJson, root, updateScriptsMode) {
     pkgJson.update({
         scripts: {
+            ...pkgJson.content.scripts,
             generate: 'vovk generate',
-            dev: updateScriptsMode === 'explicit'
-                ? "PORT=3000 concurrently 'vovk dev' 'next dev' --kill-others"
-                : 'vovk dev --next-dev',
+            dev: getDevScript(pkgJson, updateScriptsMode),
         },
     });
     await pkgJson.save();

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/initProgram.d.mts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export default function initProgram(program: Command): Command;

package/dist/initProgram.mjs

@@ -0,0 +1,22 @@
+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.ts 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')
+        .option('--validate-on-client', 'path to validateOnClient file')
+        .option('--react-query', 'use @tanstack/react-query for data fetching inside components')
+        .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.d.mts

@@ -1,5 +1,11 @@
+import type { VovkConfig } from './types.mjs';
 export type Segment = {
     routeFilePath: string;
     segmentName: string;
+    segmentImportPath: string;
 };
-export default function locateSegments(dir: string, rootDir?: string): Promise<Segment[]>;
+export default function locateSegments({ dir, rootDir, config, }: {
+    dir: string;
+    rootDir?: string;
+    config: Required<VovkConfig> | null;
+}): Promise<Segment[]>;

package/dist/locateSegments.mjs

@@ -1,8 +1,10 @@
-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) {
+// config: null is used for testing
+export default async function locateSegments({ dir, rootDir, config, }) {
     let results = [];
+    rootDir = rootDir ?? dir;
     // Read the contents of the directory
     const list = await fs.readdir(dir);
     // Iterate through each item in the directory
@@ -16,12 +18,13 @@ 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);
-                    results.push({ routeFilePath, segmentName });
+                    const segmentName = path.relative(rootDir, dir).replace(/\\/g, '/'); // windows fix
+                    const segmentImportPath = path.relative(config?.clientOutDir ?? '.__', routeFilePath);
+                    results.push({ routeFilePath, segmentName, segmentImportPath });
                 }
             }
             // Recursively search inside subdirectories
-            const subDirResults = await locateSegments(filePath, rootDir);
+            const subDirResults = await locateSegments({ dir: filePath, rootDir, config });
             results = results.concat(subDirResults);
         }
     }

package/dist/new/addClassToSegmentCode.d.mts

@@ -1,6 +1,5 @@
-export default function addClassToSegmentCode(segmentSourceCode: string, { sourceName, compiledName, type, importPath, }: {
+export default function addClassToSegmentCode(segmentSourceCode: string, { sourceName, compiledName, importPath, }: {
     sourceName: string;
     compiledName: string;
-    type: 'worker' | 'controller';
     importPath: string;
 }): string;

package/dist/new/addClassToSegmentCode.mjs

@@ -1,6 +1,10 @@
-import { Project, SyntaxKind } from 'ts-morph';
-export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, type, importPath, }) {
-    const project = new Project();
+import { Project, QuoteKind, SyntaxKind } from 'ts-morph';
+export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, importPath, }) {
+    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) => {
@@ -12,8 +16,8 @@ export default function addClassToSegmentCode(segmentSourceCode, { sourceName, c
             moduleSpecifier: importPath,
         });
     }
-    // Get the variable declaration for controllers or workers
-    const variableDeclaration = sourceFile.getVariableDeclaration(`${type}s`);
+    // Get the variable declaration for controllers
+    const variableDeclaration = sourceFile.getVariableDeclaration('controllers');
     if (variableDeclaration) {
         const initializer = variableDeclaration.getInitializer();
         if (initializer && initializer.getKind() === SyntaxKind.ObjectLiteralExpression) {

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[], { dryRun, dirName, 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, dirName, 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
@@ -26,8 +26,8 @@ export default async function newComponents(components, { dryRun, dirName, templ
         await newModule({
             what,
             moduleNameWithOptionalSegment,
-            dirName,
-            template,
+            dir,
+            templates,
             overwrite,
             noSegmentUpdate,
             dryRun,

package/dist/new/newModule.d.mts

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