vovk-cli 0.1.0 → 0.1.1

package/dist/index.mjs

@@ -177,6 +177,7 @@ program
     .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('--bundle', 'set up "tsdown" bundler')
     .option('--lang <languages...>', 'generate client for other programming languages by default ("py" for Python and "rs" for Rust are supported)')

package/dist/init/index.d.mts

@@ -4,5 +4,5 @@ export declare class Init {
     #private;
     root: string;
     log: ReturnType<typeof getLogger>;
-    main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }: InitOptions): Promise<void>;
+    main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }: InitOptions): Promise<void>;
 }

package/dist/init/index.mjs

@@ -9,15 +9,17 @@ import { installDependencies, getPackageManager } from './installDependencies.mj
 import { getLogger } from '../utils/getLogger.mjs';
 import { createConfig } from './createConfig.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';
 export class Init {
     root;
     log;
-    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }) {
+    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }) {
         const { log, root } = this;
-        const dependencies = ['vovk', 'vovk-client', 'vovk-ajv', 'openapi3-ts'];
+        const dependencies = ['vovk', 'vovk-client', 'vovk-ajv'];
         const devDependencies = ['vovk-cli'];
         if (lang?.includes('py')) {
             devDependencies.push('vovk-python');
@@ -54,6 +56,21 @@ export class Init {
                 devDependencies.push('concurrently');
             }
         }
+        if (updateTsConfig) {
+            try {
+                const compilerOptions = {
+                    experimentalDecorators: true,
+                };
+                if (!dryRun)
+                    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}`);
+            }
+        }
         if (!dryRun && pkgJson) {
             let depsUpdated = false;
             const packageManager = getPackageManager({ useNpm, useYarn, usePnpm, useBun, pkgJson });
@@ -110,7 +127,7 @@ export class Init {
             log.error(`Failed to create config: ${error.message}. Please, refer to the documentation at https://vovk.dev/config`);
         }
     }
-    async main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }) {
+    async main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, bundle, lang, dryRun, channel, }) {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix ?? '.');
         const log = getLogger(logLevel ?? 'info');
@@ -126,6 +143,7 @@ export class Init {
                 usePnpm: usePnpm ?? false,
                 useBun: useBun ?? false,
                 skipInstall: skipInstall ?? false,
+                updateTsConfig: updateTsConfig ?? true,
                 updateScripts: updateScripts ?? 'implicit',
                 validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'zod'),
                 bundle: bundle ?? true,
@@ -173,6 +191,21 @@ export class Init {
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
                     })));
+        if (typeof updateTsConfig === 'undefined' && pkgJson) {
+            let shouldAsk = false;
+            try {
+                shouldAsk = !(await checkTSConfigForExperimentalDecorators(root));
+            }
+            catch (error) {
+                log.error(`Failed to check tsconfig.json for "experimentalDecorators": ${error.message}`);
+            }
+            if (shouldAsk) {
+                const keys = ['experimentalDecorators'];
+                updateTsConfig = await confirm({
+                    message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json? (recommended)`,
+                });
+            }
+        }
         bundle ??= await confirm({
             message: 'Do you want to set up "tsdown" to bundle TypeScript client (experimental)?',
             default: true,
@@ -213,6 +246,7 @@ export class Init {
             usePnpm: usePnpm ?? false,
             useBun: useBun ?? false,
             skipInstall: skipInstall ?? false,
+            updateTsConfig,
             updateScripts,
             validationLibrary,
             bundle,

package/dist/init/updateDependenciesWithoutInstalling.mjs

@@ -2,12 +2,23 @@ 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, log, }) {
+/** Root of the monorepo packages directory (…/packages) resolved from the compiled CLI location (dist/init/). */
+const packagesRoot = path.resolve(import.meta.dirname, '../../..');
+/** Vovk package names that have a matching local directory under packages/. */
+const localPackageDirs = {
+    vovk: 'vovk',
+    'vovk-cli': 'vovk-cli',
+    'vovk-client': 'vovk-client',
+    'vovk-ajv': 'vovk-ajv',
+    'vovk-python': 'vovk-python',
+    'vovk-rust': 'vovk-rust',
+};
+async function updateDeps({ packageJson, packageNames, channel, key, log, dir, }) {
+    const useLocal = process.env.NODE_ENV === 'test';
     return Promise.all(packageNames.map(async (packageName) => {
         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);
@@ -19,11 +30,17 @@ async function updateDeps({ packageJson, packageNames, channel, key, log, }) {
             }
         }
         else {
-            // Handle regular packages (name@version)
             const parts = packageName.split('@');
             name = parts[0];
             version = parts[1];
         }
+        // In test mode, use file: paths for local vovk packages
+        if (useLocal && name in localPackageDirs) {
+            const rel = path.relative(dir, path.join(packagesRoot, localPackageDirs[name]));
+            packageJson[key] ??= {};
+            packageJson[key][name] = `file:${rel}`;
+            return;
+        }
         if (version) {
             packageJson[key] ??= {};
             packageJson[key][name] = version;
@@ -46,8 +63,8 @@ async function updateDeps({ packageJson, packageNames, channel, key, log, }) {
 export 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, log, key: 'dependencies' });
-    await updateDeps({ packageJson, packageNames: devDependencyNames, channel, log, key: 'devDependencies' });
+    await updateDeps({ packageJson, packageNames: dependencyNames, channel, log, key: 'dependencies', dir });
+    await updateDeps({ packageJson, packageNames: devDependencyNames, channel, log, key: 'devDependencies', dir });
     await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
     log.info('Added dependencies to package.json:');
     for (const dependency of dependencyNames) {

package/dist/types.d.mts

@@ -61,6 +61,7 @@ export interface InitOptions {
     usePnpm?: boolean;
     useBun?: boolean;
     skipInstall?: boolean;
+    updateTsConfig?: boolean;
     updateScripts?: 'implicit' | 'explicit';
     bundle?: boolean;
     validationLibrary?: 'zod' | 'valibot' | 'arktype' | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "CLI tool for managing Vovk.ts projects",
   "files": [
     "dist",
@@ -18,8 +18,8 @@
     "build": "rm -rf dist tsconfig.build.tsbuildinfo && tsc -P tsconfig.build.json",
     "postbuild": "chmod +x ./dist/index.mjs",
     "pre-test": "npm run build && npm run clear-test-cache",
-    "test-only": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-only test/spec/**/*.mts",
-    "test": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-concurrency=1 test/spec/**/*.mts",
+    "test-only": "npm run pre-test && NODE_ENV=test node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-only test/spec/**/*.mts",
+    "test": "npm run pre-test && NODE_ENV=test node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-concurrency=1 test/spec/**/*.mts",
     "tsc": "tsc --noEmit",
     "ncu": "npm-check-updates -u -x commander,node-pty",
     "npm-publish": "npm publish",
@@ -42,11 +42,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": ">=3.0.0-beta.1",
-    "vovk-ajv": ">=0.0.0-beta.1",
-    "vovk-client": ">=0.0.4-beta.25",
-    "vovk-python": ">=0.0.1-beta.14",
-    "vovk-rust": ">=0.0.1-beta.16"
+    "vovk": ">=3.0.0-beta.1"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.7"
@@ -71,7 +67,6 @@
     "jsonc-parser": "^3.3.1",
     "lodash": "^4.17.23",
     "loglevel": "^1.9.2",
-    "openapi3-ts": "^4.5.0",
     "pluralize": "^8.0.0",
     "prettier": "^3.8.1",
     "tar-stream": "^3.1.8",
@@ -91,6 +86,7 @@
     "create-next-app": "^16.1.6",
     "http-server": "^14.1.1",
     "node-pty": "0.10.1",
+    "openapi3-ts": "^4.5.0",
     "tsdown": "^0.19.0",
     "zod": "^4.3.6"
   }