vovk-cli 0.0.5 → 0.1.1

package/README.md

@@ -9,6 +9,8 @@
   <br>
   <strong>Back-end Framework for Next.js App Router</strong>
   <br />
+  <em>One codebase → type-safe clients, OpenAPI, and AI tools</em>
+  <br />
   <a href="https://vovk.dev/">Documentation</a>
   &nbsp;&nbsp;
   <a href="https://vovk.dev/quick-install">Quick Start</a>
@@ -28,8 +30,8 @@ npm install -D vovk-cli
 
 - [vovk dev](https://vovk.dev/dev) - starts the development script that watches the changes in [controllers](https://vovk.dev/controller) and regenerates the [schema](https://vovk.dev/schema) and [client](https://vovk.dev/typescript)
 - [vovk generate](https://vovk.dev/generate) - generates the client based on the schema
-- [vovk bundle](https://vovk.dev/bundle) - bundles the client with [tsdown](https://tsdown.dev/)
-- [vovk init](https://vovk.dev/init) - initializes a new Vovk.ts project
+- [vovk bundle](https://vovk.dev/bundle) - bundles the client (requires `bundle.build` config to be set)
+- [vovk init](https://vovk.dev/init) - initializes a new Vovk.ts project in an existing Next.js app
 - [vovk new](https://vovk.dev/new) - generates a new controller, service or a custom module
 
 ```sh

package/dist/init/index.mjs

@@ -19,7 +19,7 @@ export class Init {
     log;
     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');
@@ -170,7 +170,7 @@ export class Init {
                 ? null
                 : (validationLibrary ??
                     (await select({
-                        message: 'Choose validation library',
+                        message: 'Which validation library would you like to use?',
                         default: 'zod',
                         choices: [
                             {
@@ -207,7 +207,7 @@ export class Init {
             }
         }
         bundle ??= await confirm({
-            message: 'Do you want to set up "tsdown" to bundle TypeScript client?',
+            message: 'Do you want to set up "tsdown" to bundle TypeScript client (experimental)?',
             default: true,
         });
         updateScripts ??= !pkgJson

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.5",
+  "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"
   }