vovk-cli 0.0.1-draft.26 → 0.0.1-draft.261

package/dist/init/index.mjs

@@ -1,13 +1,14 @@
-import { confirm, select } from '@inquirer/prompts';
+import { confirm, select, checkbox } from '@inquirer/prompts';
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import getConfigPaths from '../getProjectInfo/getConfigAbsolutePaths.mjs';
 import chalk from 'chalk';
+import NPMCliPackageJson from '@npmcli/package-json';
+import getConfigPaths from '../getProjectInfo/getConfig/getConfigAbsolutePaths.mjs';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 import installDependencies, { getPackageManager } from './installDependencies.mjs';
 import getLogger from '../utils/getLogger.mjs';
 import createConfig from './createConfig.mjs';
-import updateNPMScripts from './updateNPMScripts.mjs';
+import updateNPMScripts, { getDevScript } from './updateNPMScripts.mjs';
 import checkTSConfigForExperimentalDecorators from './checkTSConfigForExperimentalDecorators.mjs';
 import updateTypeScriptConfig from './updateTypeScriptConfig.mjs';
 import updateDependenciesWithoutInstalling from './updateDependenciesWithoutInstalling.mjs';
@@ -16,27 +17,35 @@ import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 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, reactQuery, lang, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk'];
+        const dependencies = ['vovk', 'vovk-client'];
         const devDependencies = ['vovk-cli'];
+        if (lang?.includes('py')) {
+            dependencies.push('vovk-python');
+        }
+        if (lang?.includes('rs')) {
+            dependencies.push('vovk-rust');
+        }
         // delete older config files
         if (configPaths.length) {
             await Promise.all(configPaths.map((configPath) => fs.rm(configPath)));
             log.debug(`Deleted existing config file${configPaths.length > 1 ? 's' : ''} at ${configPaths.join(', ')}`);
         }
         if (validationLibrary) {
-            dependencies.push(validationLibrary);
-            dependencies.push(...({
+            dependencies.push(validationLibrary, 'vovk-ajv', ...({
                 'vovk-zod': ['zod'],
                 'vovk-yup': ['yup'],
-                'vovk-dto': ['class-validator', 'class-transformer'],
+                'vovk-dto': ['class-validator', 'class-transformer', 'dto-mapped-types', 'reflect-metadata'],
             }[validationLibrary] ?? []));
         }
+        if (reactQuery) {
+            dependencies.push('vovk-react-query', '@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) {
@@ -48,9 +57,17 @@ export class Init {
         }
         if (updateTsConfig) {
             try {
+                const compilerOptions = {
+                    experimentalDecorators: true,
+                };
+                if (validationLibrary === 'vovk-dto') {
+                    compilerOptions.emitDecoratorMetadata = true;
+                }
                 if (!dryRun)
-                    await updateTypeScriptConfig(root);
-                log.info('Added "experimentalDecorators" to tsconfig.json');
+                    await updateTypeScriptConfig(root, compilerOptions);
+                log.info(`Added ${Object.keys(compilerOptions)
+                    .map((k) => `"${k}"`)
+                    .join(' and ')} to tsconfig.json`);
             }
             catch (error) {
                 log.error(`Failed to update tsconfig.json: ${error.message}`);
@@ -70,7 +87,17 @@ export class Init {
             }
             catch (e) {
                 const error = e;
-                logUpdateDependenciesError({ log, error, useNpm, useYarn, usePnpm, useBun, dependencies, devDependencies });
+                logUpdateDependenciesError({
+                    log,
+                    error,
+                    useNpm,
+                    useYarn,
+                    usePnpm,
+                    useBun,
+                    dependencies,
+                    devDependencies,
+                    channel,
+                });
             }
             if (depsUpdated) {
                 const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
@@ -92,7 +119,7 @@ export class Init {
                         log.info('Dependencies installed successfully');
                     }
                     catch (error) {
-                        log.warn(`Failed to install dependencies: ${error.message}. Please, install them manually with ${chalkHighlightThing(packageManager + ' install')}`);
+                        log.warn(`Failed to install dependencies. ${error.message}. Please, install them manually with ${chalkHighlightThing(packageManager + ' install')}`);
                     }
                 }
             }
@@ -101,23 +128,24 @@ export class Init {
             const { configAbsolutePath } = await createConfig({
                 root,
                 log,
-                options: { validationLibrary, validateOnClient, channel, dryRun },
+                options: { validationLibrary, reactQuery, channel, lang, dryRun },
             });
-            log.info('Config created successfully at ' + configAbsolutePath);
+            log.info('Config created successfully at ' + chalkHighlightThing(configAbsolutePath));
         }
         catch (error) {
             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, reactQuery, lang, 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,
@@ -126,9 +154,10 @@ export class Init {
                 updateTsConfig: updateTsConfig ?? true,
                 updateScripts: updateScripts ?? 'implicit',
                 validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'vovk-zod'),
-                validateOnClient: validateOnClient ?? true,
+                reactQuery: reactQuery ?? true,
                 dryRun: dryRun ?? false,
                 channel: channel ?? 'latest',
+                lang: lang ?? [],
             });
         }
         if (!(await getFileSystemEntryType(path.join(root, 'package.json')))) {
@@ -164,56 +193,62 @@ 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, dto-mapped-types and reflect-metadata',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
                     })));
-        if (validationLibrary) {
-            validateOnClient =
-                validateOnClient ??
-                    (await confirm({
-                        message: 'Do you want to enable client validation?',
-                    }));
-        }
-        updateScripts =
-            updateScripts ??
-                (await select({
-                    message: 'Do you want to update package.json by adding "generate" and "dev" NPM scripts?',
-                    default: 'implicit',
-                    choices: [
-                        {
-                            name: 'Yes, use "concurrently" implicitly',
-                            value: 'implicit',
-                            description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"vovk dev --next-dev"`)}`,
-                        },
-                        {
-                            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 'next dev' 'vovk dev' --kill-others"`)}`,
-                        },
-                        {
-                            name: 'No',
-                            value: undefined,
-                            description: 'Add the NPM scripts manually',
-                        },
-                    ],
-                }));
+        updateScripts ??= await select({
+            message: 'Do you want to update "dev" NPM script at package.json?',
+            default: 'implicit',
+            choices: [
+                {
+                    name: 'Yes, use "concurrently" implicitly',
+                    value: 'implicit',
+                    description: `The 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 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 NPM scripts manually',
+                },
+            ],
+        });
+        reactQuery ??= await confirm({
+            default: false,
+            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));
+                shouldAsk = !(await checkTSConfigForExperimentalDecorators(root)); // TODO also check for emitDecoratorMetadata when vovk-dto is used
             }
             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) {
+                const keys = ['experimentalDecorators'];
+                if (validationLibrary === 'vovk-dto') {
+                    keys.push('emitDecoratorMetadata');
+                }
                 updateTsConfig = await confirm({
-                    message: 'Do you want to add experimentalDecorators to tsconfig.json?',
+                    message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json?`,
                 });
             }
         }
-        await this.#init({ configPaths }, {
+        lang ??= await checkbox({
+            message: 'Do you want to generate RPC client for other languages besides TypeScript?',
+            choices: [
+                { name: 'Python', value: 'py' },
+                { name: 'Rust', value: 'rs' },
+            ],
+        });
+        await this.#init({ configPaths, pkgJson }, {
             useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
             useYarn: useYarn ?? false,
             usePnpm: usePnpm ?? false,
@@ -222,7 +257,8 @@ export class Init {
             updateTsConfig,
             updateScripts,
             validationLibrary,
-            validateOnClient,
+            reactQuery,
+            lang,
             dryRun,
             channel,
         });

package/dist/init/installDependencies.mjs

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 export function getPackageManager(options) {
     if (options.useNpm)
         return 'npm';
@@ -12,9 +13,10 @@ export function getPackageManager(options) {
 }
 export default async function installDependencies({ log, cwd, options, }) {
     const packageManager = getPackageManager(options);
-    log.info(`Installing dependencies at ${cwd} using ${packageManager}...`);
+    log.info(`Installing dependencies at ${chalkHighlightThing(cwd)} using ${chalkHighlightThing(packageManager)}...`);
     await new Promise((resolve, reject) => {
-        const child = spawn(packageManager, ['install'], { cwd, stdio: 'inherit' });
+        const args = packageManager === 'yarn' ? ['install', '--non-interactive'] : ['install'];
+        const child = spawn(packageManager, args, { cwd, stdio: 'inherit' });
         child.on('close', (code) => {
             if (code === 0) {
                 resolve();

package/dist/init/logUpdateDependenciesError.d.mts

@@ -1,5 +1,6 @@
+import type { InitOptions } from '../types.mjs';
 import type getLogger from '../utils/getLogger.mjs';
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, }: {
+export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, channel, }: {
     useNpm?: boolean;
     useYarn?: boolean;
     usePnpm?: boolean;
@@ -8,4 +9,5 @@ export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, u
     dependencies: string[];
     devDependencies: string[];
     error: Error;
+    channel: InitOptions['channel'];
 }): void;

package/dist/init/logUpdateDependenciesError.mjs

@@ -1,8 +1,14 @@
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import { getPackageManager } from './installDependencies.mjs';
-export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, }) {
+export default function logUpdateDependenciesError({ useNpm, useYarn, usePnpm, useBun, log, dependencies, devDependencies, error, channel, }) {
     const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun });
     const installCommands = [];
+    const addChannel = (packageName) => {
+        const isVovk = packageName.startsWith('vovk') && packageName !== 'dto-mapped-types';
+        return isVovk ? (!channel || channel !== 'latest' ? `${packageName}@${channel}` : packageName) : packageName;
+    };
+    dependencies = dependencies.map(addChannel);
+    devDependencies = devDependencies.map(addChannel);
     if (dependencies.length > 0) {
         let depInstallCmd = '';
         switch (packageManager) {

package/dist/init/updateDependenciesWithoutInstalling.mjs

@@ -2,29 +2,59 @@ 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, }) {
+async function updateDeps({ packageJson, packageNames, channel, key, log, }) {
     return Promise.all(packageNames.map(async (packageName) => {
-        const metadata = await getNPMPackageMetadata(packageName);
-        const isVovk = packageName.startsWith('vovk');
-        const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
-        if (!packageJson[key]) {
-            packageJson[key] = {};
+        let name;
+        let version;
+        if (packageName.startsWith('@')) {
+            // Handle scoped packages (@org/name@version)
+            const lastAtIndex = packageName.lastIndexOf('@');
+            if (lastAtIndex > 0) {
+                name = packageName.substring(0, lastAtIndex);
+                version = packageName.substring(lastAtIndex + 1);
+            }
+            else {
+                name = packageName;
+                version = undefined;
+            }
+        }
+        else {
+            // Handle regular packages (name@version)
+            const parts = packageName.split('@');
+            name = parts[0];
+            version = parts[1];
+        }
+        if (version) {
+            packageJson[key] ??= {};
+            packageJson[key][name] = version;
+            return;
         }
-        packageJson[key][packageName] = `^${latestVersion}`;
+        let metadata;
+        try {
+            metadata = await getNPMPackageMetadata(name);
+        }
+        catch (error) {
+            log.error(`Failed to fetch metadata for package ${name}@${channel ?? 'latest'}: ${error}`);
+            return;
+        }
+        const isVovk = name.startsWith('vovk') && name !== 'dto-mapped-types';
+        const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
+        packageJson[key] ??= {};
+        packageJson[key][name] = `^${latestVersion}`;
     }));
 }
 export default async function updateDependenciesWithoutInstalling({ log, dir, dependencyNames, devDependencyNames, channel, }) {
     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' });
-    await updateDeps({ packageJson, packageNames: devDependencyNames, channel, key: 'devDependencies' });
+    await updateDeps({ packageJson, packageNames: dependencyNames, channel, log, key: 'dependencies' });
+    await updateDeps({ packageJson, packageNames: devDependencyNames, channel, log, key: 'devDependencies' });
     await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
     log.info('Added dependencies to package.json:');
     for (const dependency of dependencyNames) {
-        log.raw.log(` - ${chalk.cyan(dependency)}`);
+        log.raw.info(` - ${chalk.cyan(dependency)}`);
     }
     log.info('Added devDependencies to package.json:');
     for (const dependency of devDependencyNames) {
-        log.raw.log(` - ${chalk.cyan(dependency)}`);
+        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,15 @@
-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: {
-            generate: 'vovk generate',
-            dev: updateScriptsMode === 'explicit'
-                ? "PORT=3000 concurrently 'next dev' 'vovk dev' --kill-others"
-                : 'vovk dev --next-dev',
+            ...pkgJson.content.scripts,
+            dev: getDevScript(pkgJson, updateScriptsMode),
         },
     });
     await pkgJson.save();

package/dist/init/updateTypeScriptConfig.d.mts

@@ -1 +1,4 @@
-export default function updateTypeScriptConfig(root: string): Promise<void>;
+export default function updateTypeScriptConfig(root: string, compilerOptions: {
+    experimentalDecorators?: true;
+    emitDecoratorMetadata?: true;
+}): Promise<void>;

package/dist/init/updateTypeScriptConfig.mjs

@@ -2,14 +2,18 @@ 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) {
+export default async function updateTypeScriptConfig(root, compilerOptions) {
     const tsconfigPath = path.join(root, 'tsconfig.json');
     const tsconfigContent = await fs.readFile(tsconfigPath, 'utf8');
-    // Use jsonc-parser to generate edits and modify the experimentalDecorators property
-    const edits = jsonc.modify(tsconfigContent, ['compilerOptions', 'experimentalDecorators'], true, {
-        formattingOptions: {},
-    });
-    // Apply the edits to the original content
-    const updatedContent = await prettify(jsonc.applyEdits(tsconfigContent, edits), tsconfigPath);
+    let updatedContent = tsconfigContent;
+    // Apply each compiler option
+    for (const [key, value] of Object.entries(compilerOptions)) {
+        const edits = jsonc.modify(updatedContent, ['compilerOptions', key], value, {
+            formattingOptions: {},
+        });
+        updatedContent = jsonc.applyEdits(updatedContent, edits);
+    }
+    // Prettify the final content
+    updatedContent = await prettify(updatedContent, tsconfigPath);
     await fs.writeFile(tsconfigPath, updatedContent, 'utf8');
 }

package/dist/initProgram.d.mts

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

package/dist/initProgram.mjs

@@ -1,21 +1,22 @@
 import { Init } from './init/index.mjs';
 // reused at vovk-init
-export default function initProgram(program) {
+export 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', 'Validate on client')
-        .option('--channel <channel>', 'Channel to use for fetching packages', 'latest')
-        .option('--dry-run', 'Do not write files to disk')
+        .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('--lang <languages...>', 'generate client for other programming languages by default ("py" for Python and "rs" for Rust are supported)')
+        .option('--validation-library <library>', 'validation library to use ("vovk-zod", "vovk-yup", "vovk-dto" or another); set to "none" to skip')
+        .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,12 @@
+import type { VovkStrictConfig } from 'vovk';
+import type { ProjectInfo } from './getProjectInfo/index.mjs';
 export type Segment = {
     routeFilePath: string;
     segmentName: string;
 };
-export default function locateSegments(dir: string, rootDir?: string): Promise<Segment[]>;
+export declare function locateSegments({ dir, rootDir, config, log, }: {
+    dir: string | null;
+    rootDir?: string;
+    config: VovkStrictConfig | null;
+    log: ProjectInfo['log'];
+}): Promise<Segment[]>;

package/dist/locateSegments.mjs

@@ -1,10 +1,20 @@
 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) {
+export async function locateSegments({ dir, rootDir, config, log, }) {
     let results = [];
+    if (!dir)
+        return results; // If dir is null, return empty results because this isn't a Next.js app
+    rootDir = rootDir ?? dir;
+    let list = [];
     // Read the contents of the directory
-    const list = await fs.readdir(dir);
+    try {
+        list = (await fs.readdir(dir)).toSorted();
+    }
+    catch {
+        // do nothing
+        return results;
+    }
     // Iterate through each item in the directory
     for (const file of list) {
         const filePath = path.join(dir, file);
@@ -16,12 +26,12 @@ 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 });
                 }
             }
             // Recursively search inside subdirectories
-            const subDirResults = await locateSegments(filePath, rootDir);
+            const subDirResults = await locateSegments({ dir: filePath, rootDir, config, log });
             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,5 +1,5 @@
 import { Project, QuoteKind, SyntaxKind } from 'ts-morph';
-export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, type, importPath, }) {
+export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, importPath, }) {
     const project = new Project({
         manipulationSettings: {
             quoteKind: QuoteKind.Single,
@@ -16,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 '../types.mjs';
-export default function newComponents(components: string[], { dryRun, dir, templates, overwrite, noSegmentUpdate }: NewOptions): Promise<void>;
+export declare function newComponents(components: string[], { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }: 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, templates, overwrite, noSegmentUpdate }) {
+export async function newComponents(components, { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }) {
     if (components[0] === 'segment' || components[0] === 'segments') {
         // vovk new segment [segmentName]
         let segmentNames = components
@@ -10,7 +10,7 @@ export default async function newComponents(components, { dryRun, dir, templates
             segmentNames = [''];
         }
         for (const segmentName of segmentNames) {
-            await newSegment({ segmentName, overwrite, dryRun });
+            await newSegment({ segmentName, isStaticSegment, overwrite, dryRun });
         }
     }
     else {
@@ -31,6 +31,7 @@ export default async function newComponents(components, { dryRun, dir, templates
             overwrite,
             noSegmentUpdate,
             dryRun,
+            empty,
         });
     }
 }

package/dist/new/newModule.d.mts

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