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

package/dist/index.mjs

@@ -1,51 +1,62 @@
 #!/usr/bin/env node
-import path from 'path';
+import path from 'node:path';
+import { readFileSync } from 'node:fs';
+import 'dotenv/config';
 import { Command } from 'commander';
-import { readFileSync } from 'fs';
 import concurrently from 'concurrently';
 import getAvailablePort from './utils/getAvailablePort.mjs';
 import getProjectInfo from './getProjectInfo/index.mjs';
-import generateClient from './generateClient.mjs';
+import generate from './generate/index.mjs';
 import locateSegments from './locateSegments.mjs';
-import { VovkCLIWatcher } from './watcher/index.mjs';
-import { Init } from './init/index.mjs';
+import { VovkDev } from './dev/index.mjs';
 import newComponents from './new/index.mjs';
-import 'dotenv/config';
+import initProgram from './initProgram.mjs';
+import { getFullSchemaFromJSON } from './generate/getFullSchemaFromJSON.mjs';
 const program = new Command();
 const packageJSON = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
 program.name('vovk').description('Vovk CLI').version(packageJSON.version);
+initProgram(program.command('init'));
 program
     .command('dev')
-    .description('Start schema watcher (optional flag --next-dev to start it with Next.js)')
-    .option('--client-out <path>', 'Path to client output directory')
-    .option('--next-dev', 'Start schema watcher and Next.js with automatic port allocation', false)
-    .allowUnknownOption(true)
-    .action(async (options, command) => {
+    .alias('d')
+    .description('start schema watcher (optional flag --next-dev to start it with Next.js)')
+    .argument('[nextArgs...]', 'extra arguments for the dev command')
+    .option('--next-dev', 'start schema watcher and Next.js with automatic port allocation')
+    .option('--exit', 'kill the processe when schema and client is generated')
+    .action(async (nextArgs, options) => {
+    const { nextDev, exit = false } = options;
     const portAttempts = 30;
-    const PORT = !options.nextDev
+    const PORT = !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(() => {
-                throw new Error(`🐺 ❌ Failed to find available Next port after ${portAttempts} attempts`);
+            (await getAvailablePort(3000, portAttempts, 0, (failedPort, tryingPort) => 
+            // eslint-disable-next-line no-console
+            console.warn(`🐺 Port ${failedPort} is in use, trying ${tryingPort} instead.`)).catch(() => {
+                throw new Error(`🐺 ❌ Failed to find an available port after ${portAttempts} attempts`);
             }));
     if (!PORT) {
         throw new Error('🐺 ❌ PORT env variable is required');
     }
-    if (options.nextDev) {
+    if (nextDev) {
         const { result } = concurrently([
             {
-                command: `node ${import.meta.dirname}/watcher/index.mjs`,
-                name: 'Vovk.ts Schema Watcher',
-                env: Object.assign({ PORT, __VOVK_START_WATCHER_IN_STANDALONE_MODE__: 'true' }, options.clientOut ? { VOVK_CLIENT_OUT_DIR: options.clientOut } : {}),
-            },
-            {
-                command: `npx next dev ${command.args.join(' ')}`,
+                command: `npx next dev ${nextArgs.join(' ')}`,
                 name: 'Next.js Development Server',
                 env: { PORT },
             },
+            {
+                command: `node ${import.meta.dirname}/dev/index.mjs`,
+                name: 'Vovk Dev Watcher',
+                env: {
+                    PORT,
+                    __VOVK_START_WATCHER_IN_STANDALONE_MODE__: 'true',
+                    __VOVK_EXIT__: exit ? 'true' : 'false',
+                },
+            },
         ], {
             killOthers: ['failure', 'success'],
             prefix: 'none',
+            successCondition: 'first',
         });
         try {
             await result;
@@ -55,65 +66,50 @@ program
         }
     }
     else {
-        void new VovkCLIWatcher().start({ clientOutDir: options.clientOut });
+        void new VovkDev().start({ exit });
     }
 });
 program
     .command('generate')
-    .description('Generate client')
-    .option('--client-out <path>', 'Path to output directory')
+    .alias('g')
+    .description('Generate RPC client from schema')
+    .option('--out, --client-out-dir <path>', 'path to output directory')
+    .option('--template, --templates <templates...>', 'client code templates ("ts", "compiled", "python", "none", a custom path)')
+    .option('--emit-full-schema, --full-schema-json [fileName]', 'generate client with full schema')
+    .option('--prettify', 'prettify output files')
+    .option('--config <config>', 'path to config file')
     .action(async (options) => {
-    const projectInfo = await getProjectInfo({ clientOutDir: options.clientOut });
+    const { clientOutDir, templates, prettify, emitFullSchema, config: configPath } = options;
+    const projectInfo = await getProjectInfo({ clientOutDir, configPath });
     const { cwd, config, apiDir } = projectInfo;
-    const segments = await locateSegments(apiDir);
+    const segments = await locateSegments({ dir: apiDir, config });
     const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
-    const schema = (await import(path.join(schemaOutAbsolutePath, 'index.js')));
-    await generateClient(projectInfo, segments, schema.default);
+    const fullSchema = await getFullSchemaFromJSON(schemaOutAbsolutePath, projectInfo);
+    await generate({
+        projectInfo,
+        segments,
+        fullSchema,
+        templates,
+        prettify,
+        forceNothingWrittenLog: true,
+        emitFullSchema,
+    });
 });
-// reused at vovk-init
-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('--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')
-        .action((prefix = '.', options) => new Init().main(prefix, options));
-}
-initProgram(program, 'init ');
 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('--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')
+    .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, --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('--empty', 'create an empty module')
+    .option('--no-segment-update', 'do not update segment files when creating a new module')
+    .option('--dry-run', 'do not write files to disk')
     .action((components, options) => newComponents(components, options));
 program
     .command('help')
     .description('Show help message')
     .action(() => program.help());
-/*
-TODO
-vovk new segment [segmentName]
-vovk new controller service [segmentName/]moduleName
-vovk new c s w [segmentName/]moduleName
-
-vovk c s w userApi/user
-vovk new c s w user
-*/
 program.parse(process.argv);
 if (!process.argv.slice(2).length) {
     program.outputHelp();

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,10 +1,9 @@
 import type getLogger from '../utils/getLogger.mjs';
-import type { InitOptions } from '../index.mjs';
-export default function createConfig({ root, log, dryRun, options: { validationLibrary, validateOnClient }, }: {
+import type { InitOptions } from '../types.mjs';
+export default function createConfig({ root, log, options: { validationLibrary, reactQuery, channel, dryRun }, }: {
     root: string;
     log: ReturnType<typeof getLogger>;
-    dryRun?: boolean;
-    options: Pick<InitOptions, 'validationLibrary' | 'validateOnClient'>;
+    options: Pick<InitOptions, 'validationLibrary' | 'reactQuery' | 'channel' | 'dryRun'>;
 }): Promise<{
     configAbsolutePath: string;
 }>;

package/dist/init/createConfig.mjs

@@ -1,9 +1,9 @@
-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';
-export default async function createConfig({ root, log, dryRun, options: { validationLibrary, validateOnClient }, }) {
+import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
+export default async function createConfig({ root, log, options: { validationLibrary, reactQuery, channel, dryRun }, }) {
     const config = {};
     const dotConfigPath = path.join(root, '.config');
     const dir = (await getFileSystemEntryType(dotConfigPath)) === FileSystemEntryType.DIRECTORY ? dotConfigPath : root;
@@ -14,21 +14,25 @@ export default async function createConfig({ root, log, dryRun, options: { valid
     const templates = {
         controller: 'vovk-cli/templates/controller.ejs',
         service: 'vovk-cli/templates/service.ejs',
-        worker: 'vovk-cli/templates/worker.ejs',
     };
     if (validationLibrary) {
-        config.validationLibrary = validationLibrary;
-        if (validateOnClient) {
-            config.validateOnClient = `${validationLibrary}/validateOnClient`;
-        }
+        config.imports ??= {};
+        config.imports.validateOnClient =
+            {
+                'vovk-dto': `vovk-dto/validateOnClient.js`,
+            }[validationLibrary] ?? 'vovk-ajv';
         try {
-            const validationTemplates = await getTemplateFilesFromPackage(validationLibrary);
+            const validationTemplates = await getTemplateFilesFromPackage(validationLibrary, channel);
             Object.assign(templates, validationTemplates);
         }
         catch (error) {
             log.warn(`Failed to fetch validation library templates: ${error.message}`);
         }
     }
+    if (reactQuery) {
+        config.imports ??= {};
+        config.imports.createRPC = 'vovk-react-query';
+    }
     config.templates = templates;
     const configStr = await prettify(`/** @type {import('vovk-cli').VovkConfig} */
 const config = ${JSON.stringify(config, null, 2)};

package/dist/init/getTemplateFilesFromPackage.d.mts

@@ -1,6 +1,7 @@
+import { InitOptions } from '../types.mjs';
 /**
  * Retrieves a list of files in the 'templates' folder of an NPM package.
  * @param packageName - The name of the NPM package.
  * @returns A promise that resolves to an array of file paths.
  */
-export default function getTemplatesFiles(packageName: string, channel?: string): Promise<Record<string, string>>;
+export default function getTemplateFilesFromPackage(packageName: string, channel?: InitOptions['channel']): Promise<Record<string, string>>;

package/dist/init/getTemplateFilesFromPackage.mjs

@@ -1,14 +1,14 @@
-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';
+// Crereated with AI
 /**
  * Retrieves a list of files in the 'templates' folder of an NPM package.
  * @param packageName - The name of the NPM package.
  * @returns A promise that resolves to an array of file paths.
  */
-export default async function getTemplatesFiles(packageName, channel = 'beta' // TODO change to latest
-) {
+export default async function getTemplateFilesFromPackage(packageName, channel = 'latest') {
     const metadata = await getNPMPackageMetadata(packageName);
     const latestVersion = metadata['dist-tags'][channel];
     const tarballUrl = metadata.versions[latestVersion].dist.tarball;
@@ -37,7 +37,6 @@ function extractTemplatesFromTarball(tarballBuffer) {
         const files = [];
         extract.on('entry', (header, stream, next) => {
             const filePath = header.name;
-            // TODO revisit comments
             // Check if the file is in the 'templates' folder
             if (filePath.startsWith('package/templates/')) {
                 files.push(filePath.replace('package/', ''));

package/dist/init/index.d.mts

@@ -1,9 +1,8 @@
-#!/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;
     root: string;
     log: ReturnType<typeof getLogger>;
-    main(prefix: string, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, dryRun, channel, }: InitOptions): Promise<void>;
+    main(prefix: string, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, reactQuery, dryRun, channel, }: InitOptions): Promise<void>;
 }

package/dist/init/index.mjs

@@ -1,82 +1,25 @@
-#!/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, { 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, reactQuery, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk'];
+        const dependencies = ['vovk', 'vovk-client', 'vovk-openapi'];
         const devDependencies = ['vovk-cli'];
         // delete older config files
         if (configPaths.length) {
@@ -84,17 +27,19 @@ export class Init {
             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', 'vovk-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) {
@@ -159,8 +104,7 @@ export class Init {
             const { configAbsolutePath } = await createConfig({
                 root,
                 log,
-                options: { validationLibrary, validateOnClient },
-                dryRun,
+                options: { validationLibrary, reactQuery, channel, dryRun },
             });
             log.info('Config created successfully at ' + configAbsolutePath);
         }
@@ -168,15 +112,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, 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,
@@ -185,7 +130,7 @@ 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',
             });
@@ -223,56 +168,54 @@ 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' },
                         ],
                     })));
-        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" scripts?',
+                    message: 'Do you want to update "dev" NPM script at package.json?',
                     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 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 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,
@@ -281,7 +224,7 @@ export class Init {
             updateTsConfig,
             updateScripts,
             validationLibrary,
-            validateOnClient,
+            reactQuery,
             dryRun,
             channel,
         });

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,12 @@
-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 isVovk = packageName.startsWith('vovk') && packageName !== 'vovk-mapped-types';
+        const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
         if (!packageJson[key]) {
             packageJson[key] = {};
         }
@@ -23,10 +21,10 @@ export default async function updateDependenciesWithoutInstalling({ log, dir, de
     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 'vovk dev' 'next dev' --kill-others"
-                : 'vovk dev --next-dev',
+            ...pkgJson.content.scripts,
+            dev: getDevScript(pkgJson, updateScriptsMode),
         },
     });
     await pkgJson.save();