vovk-cli 0.0.1-beta.57 → 0.0.1-beta.59

package/dist/index.mjs

@@ -179,6 +179,7 @@ program
     .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)')
     .option('--validation-library <library>', 'validation library to use ("zod", "valibot" or "arktype"); set to "none" to skip')
     .option('--channel <channel>', 'channel to use for fetching packages', 'latest')

package/dist/init/createConfig.d.mts

@@ -1,9 +1,9 @@
 import type { getLogger } from '../utils/getLogger.mjs';
 import type { InitOptions } from '../types.mjs';
-export declare function createConfig({ root, options: { validationLibrary, lang, dryRun }, }: {
+export declare function createConfig({ root, options: { validationLibrary, bundle, lang, dryRun }, }: {
     root: string;
     log: ReturnType<typeof getLogger>;
-    options: Pick<InitOptions, 'validationLibrary' | 'lang' | 'channel' | 'dryRun'>;
+    options: Pick<InitOptions, 'validationLibrary' | 'bundle' | 'lang' | 'channel' | 'dryRun'>;
 }): Promise<{
     configAbsolutePath: string;
 }>;

package/dist/init/createConfig.mjs

@@ -2,7 +2,8 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 import { prettify } from '../utils/prettify.mjs';
 import { getFileSystemEntryType, FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
-export async function createConfig({ root, options: { validationLibrary, lang, dryRun }, }) {
+import { updateConfigProperty } from '../utils/updateConfigProperty.mjs';
+export async function createConfig({ root, options: { validationLibrary, bundle, lang, dryRun }, }) {
     const config = {};
     const dotConfigPath = path.join(root, '.config');
     const dir = (await getFileSystemEntryType(dotConfigPath)) === FileSystemEntryType.DIRECTORY ? dotConfigPath : root;
@@ -38,10 +39,25 @@ export async function createConfig({ root, options: { validationLibrary, lang, d
         config.composedClient.fromTemplates = ['mjs', 'cjs', ...lang];
     }
     config.moduleTemplates = moduleTemplates;
-    const configStr = await prettify(`// @ts-check
+    let configStr = await prettify(`// @ts-check
 /** @type {import('vovk').VovkConfig} */
 const config = ${JSON.stringify(config, null, 2)};
 ${isModule ? '\nexport config;' : 'module.exports = config;'}`, configAbsolutePath);
+    if (bundle) {
+        configStr = await updateConfigProperty(configStr, ['bundle', 'build'], async ({ entry, outDir }) => {
+            const { build } = await import('tsdown');
+            await build({
+                entry,
+                dts: true,
+                format: ['cjs', 'esm'],
+                hash: false,
+                fixedExtension: true,
+                clean: true,
+                outDir,
+                tsconfig: './tsconfig.bundle.json',
+            });
+        });
+    }
     if (!dryRun)
         await fs.writeFile(configAbsolutePath, configStr, 'utf-8');
     return { configAbsolutePath };

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, updateTsConfig, updateScripts, validationLibrary, 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

@@ -17,7 +17,7 @@ import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
 export class Init {
     root;
     log;
-    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, 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'];
         const devDependencies = ['vovk-cli'];
@@ -39,10 +39,31 @@ export class Init {
                 arktype: ['arktype'],
             }[validationLibrary] ?? []));
         }
+        if (bundle) {
+            devDependencies.push('tsdown');
+            if (!dryRun) {
+                const bundleTsconfig = path.join(root, 'tsconfig.bundle.json');
+                const bundleTsconfigContent = {
+                    compilerOptions: {
+                        moduleResolution: 'bundler',
+                        paths: {
+                            'vovk/*': ['./node_modules/vovk/*'],
+                        },
+                    },
+                };
+                try {
+                    await fs.writeFile(bundleTsconfig, JSON.stringify(bundleTsconfigContent, null, 2));
+                    log.info(`Created bundle tsconfig at ${chalkHighlightThing(bundleTsconfig)}`);
+                }
+                catch (error) {
+                    log.error(`Failed to create bundle tsconfig at ${chalkHighlightThing(bundleTsconfig)}: ${error.message}`);
+                }
+            }
+        }
         if (updateScripts) {
             try {
                 if (!dryRun && pkgJson)
-                    await updateNPMScripts(pkgJson, root, updateScripts);
+                    await updateNPMScripts({ pkgJson, root, bundle, updateScriptsMode: updateScripts });
                 log.info('Updated scripts at package.json');
             }
             catch (error) {
@@ -114,7 +135,7 @@ export class Init {
             const { configAbsolutePath } = await createConfig({
                 root,
                 log,
-                options: { validationLibrary, channel, lang, dryRun },
+                options: { validationLibrary, channel, bundle, lang, dryRun },
             });
             log.info('Config created successfully at ' + chalkHighlightThing(configAbsolutePath));
         }
@@ -122,7 +143,7 @@ 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, bundle, lang, dryRun, channel, }) {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix ?? '.');
         const log = getLogger(logLevel ?? 'info');
@@ -141,6 +162,7 @@ export class Init {
                 updateTsConfig: updateTsConfig ?? true,
                 updateScripts: updateScripts ?? 'implicit',
                 validationLibrary: validationLibrary?.toLocaleLowerCase() === 'none' ? null : (validationLibrary ?? 'zod'),
+                bundle: bundle ?? true,
                 dryRun: dryRun ?? false,
                 channel: channel ?? 'latest',
                 lang: lang ?? [],
@@ -185,10 +207,29 @@ 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?',
+            default: true,
+        });
         updateScripts ??= !pkgJson
             ? undefined
             : await select({
-                message: 'Do you want to update "dev" and add "prebuild" NPM scripts at package.json (recommended)?',
+                message: `Do you want to update "dev" and add "prebuild"${bundle ? ' and "bundle"' : ''} NPM scripts at package.json (recommended)?`,
                 default: 'implicit',
                 choices: [
                     {
@@ -208,21 +249,6 @@ export class Init {
                     },
                 ],
             });
-        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)`,
-                });
-            }
-        }
         lang ??= await checkbox({
             message: 'Do you want to generate RPC client for other languages besides TypeScript (experimental)?',
             choices: [
@@ -239,6 +265,7 @@ export class Init {
             updateTsConfig,
             updateScripts,
             validationLibrary,
+            bundle,
             lang,
             dryRun,
             channel,

package/dist/init/updateNPMScripts.d.mts

@@ -1,3 +1,8 @@
 import NPMCliPackageJson from '@npmcli/package-json';
 export declare function getDevScript(pkgJson: NPMCliPackageJson, updateScriptsMode: 'implicit' | 'explicit'): string;
-export declare function updateNPMScripts(pkgJson: NPMCliPackageJson, root: string, updateScriptsMode: 'implicit' | 'explicit'): Promise<void>;
+export declare function updateNPMScripts({ pkgJson, bundle, updateScriptsMode, }: {
+    pkgJson: NPMCliPackageJson;
+    root: string;
+    bundle?: boolean;
+    updateScriptsMode: 'implicit' | 'explicit';
+}): Promise<void>;

package/dist/init/updateNPMScripts.mjs

@@ -8,12 +8,13 @@ export function getDevScript(pkgJson, updateScriptsMode) {
         ? `PORT=3000 concurrently '${dev}' 'vovk dev' --kill-others`
         : `vovk dev --next-dev${nextDevFlags ? ` -- ${nextDevFlags}` : ''}`;
 }
-export async function updateNPMScripts(pkgJson, root, updateScriptsMode) {
+export async function updateNPMScripts({ pkgJson, bundle, updateScriptsMode, }) {
     pkgJson.update({
         scripts: {
             ...pkgJson.content.scripts,
             dev: getDevScript(pkgJson, updateScriptsMode),
             prebuild: 'vovk generate',
+            ...(bundle ? { bundle: 'vovk bundle' } : {}),
         },
     });
     await pkgJson.save();

package/dist/new/newSegment.mjs

@@ -15,7 +15,7 @@ export async function newSegment({ projectInfo, segmentName, isStaticSegment, ov
         log.error(`Unable to create new segment. ${formatLoggedSegmentName(segmentName, { upperFirst: true })} already exists. You can use --overwrite flag to overwrite it.`);
         return process.exit(1);
     }
-    const code = await prettify(`import { initSegment${isStaticSegment ? ', generateStaticAPI' : ''} } from 'vovk';
+    const code = await prettify(`import { initSegment${isStaticSegment ? ', controllersToStaticParams' : ''} } from 'vovk';
 
 const controllers = {};
 
@@ -23,7 +23,7 @@ export type Controllers = typeof controllers;
 ${isStaticSegment
         ? `
 export function generateStaticParams() {
-  return generateStaticAPI(controllers);
+  return controllersToStaticParams(controllers);
 }
 `
         : ''}

package/dist/types.d.mts

@@ -63,6 +63,7 @@ export interface InitOptions {
     skipInstall?: boolean;
     updateTsConfig?: boolean;
     updateScripts?: 'implicit' | 'explicit';
+    bundle?: boolean;
     validationLibrary?: 'zod' | 'valibot' | 'arktype' | null;
     dryRun?: boolean;
     lang?: string[];

package/dist/utils/updateConfigProperty.d.mts

@@ -0,0 +1,2 @@
+export declare function updateConfigProperty(sourceCode: string, pathToProperty: string[], newValue: unknown): string;
+export declare function updateConfigFileProperty(absolutePathToTheFile: string, pathToProperty: string[], newValue: unknown): string;

package/dist/utils/updateConfigProperty.mjs

@@ -0,0 +1,131 @@
+import { Project, QuoteKind, IndentationText, NewLineKind, SyntaxKind, Node } from 'ts-morph';
+export function updateConfigProperty(sourceCode, pathToProperty, newValue) {
+    const project = createProject();
+    const sourceFile = project.createSourceFile('config-temp.mts', sourceCode, { overwrite: true });
+    return mutateConfig(sourceFile, pathToProperty, newValue);
+}
+export function updateConfigFileProperty(absolutePathToTheFile, pathToProperty, newValue) {
+    const project = createProject();
+    const sourceFile = project.addSourceFileAtPath(absolutePathToTheFile);
+    const updated = mutateConfig(sourceFile, pathToProperty, newValue);
+    sourceFile.saveSync();
+    return updated;
+}
+function createProject() {
+    return new Project({
+        manipulationSettings: {
+            quoteKind: QuoteKind.Single,
+            indentationText: IndentationText.TwoSpaces,
+            newLineKind: NewLineKind.LineFeed,
+        },
+    });
+}
+function mutateConfig(sourceFile, pathToProperty, newValue) {
+    const variableDeclaration = sourceFile.getVariableDeclaration('config');
+    if (!variableDeclaration) {
+        throw new Error('config variable not found in the file.');
+    }
+    const initializer = variableDeclaration.getInitializer();
+    if (!initializer || !Node.isObjectLiteralExpression(initializer)) {
+        throw new Error('config is not initialized as an object literal.');
+    }
+    let currentNode = initializer;
+    for (let i = 0; i < pathToProperty.length; i++) {
+        const key = pathToProperty[i];
+        if (!Node.isObjectLiteralExpression(currentNode)) {
+            throw new Error(`Property at path ${pathToProperty.slice(0, i).join('.')} is not an object.`);
+        }
+        const property = currentNode.getProperty(key);
+        if (!property) {
+            // Property does not exist
+            if (newValue === undefined) {
+                // Nothing to remove
+                return sourceFile.getFullText();
+            }
+            else {
+                // Create property
+                if (i === pathToProperty.length - 1) {
+                    // Last key
+                    currentNode.addPropertyAssignment({
+                        name: key,
+                        initializer: (writer) => writeInitializer(writer, newValue),
+                    });
+                }
+                else {
+                    // Need to create nested object
+                    const newObjectAssignment = currentNode.addPropertyAssignment({
+                        name: key,
+                        initializer: '{}',
+                    });
+                    const init = newObjectAssignment.getInitializerIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
+                    currentNode = init;
+                }
+            }
+        }
+        else {
+            // Property exists
+            if (Node.isPropertyAssignment(property)) {
+                const propInitializer = property.getInitializer();
+                if (i === pathToProperty.length - 1) {
+                    // Last key
+                    if (newValue === undefined) {
+                        // Remove the property
+                        property.remove();
+                    }
+                    else {
+                        // Update the value
+                        property.setInitializer((writer) => writeInitializer(writer, newValue));
+                    }
+                }
+                else {
+                    // Need to go deeper
+                    if (propInitializer && Node.isObjectLiteralExpression(propInitializer)) {
+                        currentNode = propInitializer;
+                    }
+                    else {
+                        throw new Error(`Cannot traverse into non-object property at ${pathToProperty.slice(0, i + 1).join('.')}.`);
+                    }
+                }
+            }
+            else {
+                throw new Error(`Unsupported property kind at path ${pathToProperty.slice(0, i + 1).join('.')}.`);
+            }
+        }
+    }
+    return sourceFile.getFullText();
+}
+function writeInitializer(writer, value) {
+    if (typeof value === 'string') {
+        writer.quote(value);
+    }
+    else if (typeof value === 'number' || typeof value === 'boolean') {
+        writer.write(value.toString());
+    }
+    else if (typeof value === 'function') {
+        writer.write(value.toString());
+    }
+    else if (Array.isArray(value)) {
+        writer.write('[');
+        value.forEach((item, index) => {
+            if (index > 0)
+                writer.write(', ');
+            writeInitializer(writer, item);
+        });
+        writer.write(']');
+    }
+    else if (typeof value === 'object' && value !== null) {
+        writer.write('{');
+        const entries = Object.entries(value);
+        entries.forEach(([k, v], index) => {
+            if (index > 0)
+                writer.write(', ');
+            writer.write(k);
+            writer.write(': ');
+            writeInitializer(writer, v);
+        });
+        writer.write('}');
+    }
+    else {
+        writer.write('null');
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.57",
+  "version": "0.0.1-beta.59",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -15,7 +15,7 @@
     "test-only": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --test --test-only test/spec/**/*.mts",
     "test": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --test --test-concurrency=1 test/spec/**/*.mts",
     "tsc": "tsc --noEmit",
-    "ncu": "npm-check-updates -u -x commander",
+    "ncu": "npm-check-updates -u -x commander,node-pty",
     "npm-publish": "npm publish"
   },
   "repository": {
@@ -35,11 +35,11 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-beta.85",
+    "vovk": "^3.0.0-beta.87",
     "vovk-ajv": "^0.0.0-beta.4",
     "vovk-client": "^0.0.4-beta.4",
     "vovk-python": "^0.0.1-beta.4",
-    "vovk-rust": "^0.0.1-beta.4"
+    "vovk-rust": "^0.0.1-beta.6"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.57"
@@ -83,7 +83,7 @@
     "concat-stream": "^2.0.0",
     "create-next-app": "^16.1.1",
     "http-server": "^14.1.1",
-    "node-pty": "^1.1.0",
+    "node-pty": "0.10.1",
     "tsdown": "^0.18.3",
     "zod": "^4.2.1"
   }