vovk-cli 0.0.1-draft.330 → 0.0.1-draft.332

package/dist/generate/getClientTemplateFiles.mjs

@@ -3,6 +3,8 @@ import { glob } from 'glob';
 import resolveAbsoluteModulePath from '../utils/resolveAbsoluteModulePath.mjs';
 import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 import getPublicModuleNameFromPath from '../utils/getPublicModuleNameFromPath.mjs';
+import omit from 'lodash/omit.js';
+import merge from 'lodash/merge.js';
 export default async function getClientTemplateFiles({ config, cwd, log, configKey, cliGenerateOptions, }) {
     const usedTemplateDefs = {};
     const fromTemplates = configKey === 'composedClient'
@@ -72,6 +74,8 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
                 def = {
                     ...def,
                     origin: templateDef.origin ?? def.origin,
+                    composedClient: merge(omit(templateDef?.composedClient ?? {}, ['outDir']), def.composedClient),
+                    segmentedClient: merge(omit(templateDef?.segmentedClient ?? {}, ['outDir']), def.segmentedClient),
                 };
                 entries.push([tName, def, path.join(outCwdRelativeDir, reqRelativeDir)]);
             }

package/dist/index.mjs

@@ -19,10 +19,10 @@ initProgram(program.command('init'));
 program
     .command('dev')
     .alias('d')
-    .description('start schema watcher (optional flag --next-dev to start it with Next.js)')
+    .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')
+    .option('--exit', 'kill the processes when schema and client is generated')
     .option('--schema-out <path>', 'path to schema output directory (default: .vovk-schema)')
     .option('--https, --dev-https', 'use HTTPS for the dev server (default: false)')
     .action(async (nextArgs, options) => {
@@ -76,7 +76,7 @@ program
 program
     .command('generate')
     .alias('g')
-    .description('generate RPC client from schema')
+    .description('Generate RPC client from schema')
     .option('--composed-only', 'generate only composed client even if segmented client is enabled')
     .option('--out, --composed-out <path>', 'path to output directory for composed client')
     .option('--from, --composed-from <templates...>', 'client template names for composed client')
@@ -109,7 +109,7 @@ program
 program
     .command('bundle')
     .alias('b')
-    .description('generate TypeScrtipt RPC and bundle it')
+    .description('Generate TypeScript RPC and bundle it')
     .option('--out, --out-dir <path>', 'path to output directory for bundle')
     .option('--include, --include-segments <segments...>', 'include segments')
     .option('--exclude, --exclude-segments <segments...>', 'exclude segments')
@@ -139,7 +139,7 @@ program
 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')
+    .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')

package/dist/init/index.d.mts

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

package/dist/init/index.mjs

@@ -132,9 +132,9 @@ export class Init {
             log.error(`Failed to create config: ${error.message}`);
         }
     }
-    async main(prefix, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
+    async main({ prefix, yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
         const cwd = process.cwd();
-        const root = path.resolve(cwd, prefix);
+        const root = path.resolve(cwd, prefix ?? '.');
         const log = getLogger(logLevel);
         const pkgJson = await NPMCliPackageJson.load(root);
         this.root = root;
@@ -142,6 +142,7 @@ export class Init {
         const configPaths = await getConfigPaths({ cwd, relativePath: prefix });
         if (yes) {
             return this.#init({ configPaths, pkgJson }, {
+                prefix: prefix ?? '.',
                 useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
                 useYarn: useYarn ?? false,
                 usePnpm: usePnpm ?? false,

package/dist/initProgram.mjs

@@ -2,8 +2,8 @@ import { Init } from './init/index.mjs';
 // reused at vovk-init
 export function initProgram(program) {
     return program
-        .argument('[prefix]', 'directory to initialize project in', '.')
-        .description('Initialize Vovk.ts project')
+        .description('Initialize Vovk.ts at existing Next.js project')
+        .option('--prefix <prefix>', 'directory to initialize project in')
         .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')
@@ -17,5 +17,5 @@ export function initProgram(program) {
         .option('--validation-library <library>', 'validation library to use ("vovk-zod", "vovk-dto" or another); set to "none" to skip')
         .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));
+        .action((options) => new Init().main(options));
 }

package/dist/types.d.mts

@@ -48,6 +48,7 @@ export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'],
     openapiMixinName?: string[];
 }
 export interface InitOptions {
+    prefix?: string;
     yes?: boolean;
     logLevel: LogLevelNames;
     useNpm?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.330",
+  "version": "0.0.1-draft.332",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.362"
+    "vovk": "^3.0.0-draft.366"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.31"