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

package/dist/bundle/index.mjs

@@ -10,10 +10,10 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
     const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
     const locatedSegments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const { bundle: bundleConfig } = config;
-    const tsFullClientOutAbsoluteDirInput = path.join(cwd, bundleConfig.tsClientOutDir);
-    const tsClientOutDir = cliBundleOptions?.tsClientOutDir ?? bundleConfig.tsClientOutDir;
-    const dontDeleteTsClientOutDirAfter = cliBundleOptions?.dontDeleteTsClientOutDirAfter ?? bundleConfig?.dontDeleteTsClientOutDirAfter ?? false;
-    if (!tsClientOutDir) {
+    const tsFullClientOutAbsoluteDirInput = path.join(cwd, bundleConfig.prebundleOutDir);
+    const prebundleOutDir = cliBundleOptions?.prebundleOutDir ?? bundleConfig.prebundleOutDir;
+    const keepPrebundleDir = cliBundleOptions?.keepPrebundleDir ?? bundleConfig?.keepPrebundleDir ?? false;
+    if (!prebundleOutDir) {
         throw new Error('No output directory specified for composed client');
     }
     const outDir = cliBundleOptions?.outDir ?? bundleConfig.tsdownBuildOptions.outDir;
@@ -36,7 +36,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             openapiGetMethodName: cliBundleOptions?.openapiGetMethodName,
             openapiRootUrl: cliBundleOptions?.openapiRootUrl,
             composedFrom: [BuiltInTemplateName.ts],
-            composedOut: tsClientOutDir,
+            composedOut: prebundleOutDir,
             composedOnly: true,
             composedIncludeSegments: cliBundleOptions.includeSegments ?? bundleConfig.includeSegments,
             composedExcludeSegments: cliBundleOptions.excludeSegments ?? bundleConfig.excludeSegments,
@@ -79,7 +79,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             },
         });
     }
-    if (!dontDeleteTsClientOutDirAfter) {
+    if (!keepPrebundleDir) {
         await fs.rm(tsFullClientOutAbsoluteDirInput, { recursive: true, force: true });
         log.debug(`Deleted temporary TypeScript client output directory: ${chalkHighlightThing(tsFullClientOutAbsoluteDirInput)}`);
     }

package/dist/dev/index.mjs

@@ -369,7 +369,7 @@ export class VovkDev {
                             void this.#requestSchema(segmentName).then(({ isError: isError2 }) => {
                                 if (!isError2) {
                                     clearInterval(interval);
-                                    log.info(`Requested schema for ${formatLoggedSegmentName(segmentName)} after ${attempts} attempts`);
+                                    log.info(`Requested schema for ${formatLoggedSegmentName(segmentName)} after ${attempts} attempt${attempts === 1 ? '' : 's'}`);
                                 }
                             });
                         }, DELAY);

package/dist/generate/generate.mjs

@@ -157,7 +157,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 projectInfo,
                 clientTemplateFile,
                 fullSchema: composedFullSchema,
-                prettifyClient: config.prettifyClient,
+                prettifyClient: config.composedClient.prettifyClient,
                 segmentName: null,
                 imports: clientImports.composedClient,
                 templateContent,
@@ -243,7 +243,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     projectInfo,
                     clientTemplateFile,
                     fullSchema: segmentedFullSchema,
-                    prettifyClient: config.prettifyClient,
+                    prettifyClient: config.segmentedClient.prettifyClient,
                     segmentName,
                     imports: clientImports.segmentedClient[segmentName],
                     templateContent,

package/dist/generate/writeOneClientFile.mjs

@@ -101,7 +101,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
         })
         : templateContent;
     // Optionally prettify
-    if (prettifyClient || config.prettifyClient) {
+    if (prettifyClient) {
         rendered = await prettify(rendered, outPath);
     }
     if (isEnsuringClient) {

package/dist/getProjectInfo/getConfig/index.d.mts

@@ -14,7 +14,6 @@ export default function getConfig({ configPath, cwd }: {
         rootEntry?: string;
         origin?: string;
         logLevel?: "error" | "trace" | "debug" | "info" | "warn" | (string & {});
-        prettifyClient?: boolean;
         libs?: {
             ajv: import("vovk").KnownAny;
             [key: string]: import("vovk").KnownAny;
@@ -24,6 +23,7 @@ export default function getConfig({ configPath, cwd }: {
             enabled?: boolean;
             outDir?: string;
             fromTemplates?: string[];
+            prettifyClient?: boolean;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -40,6 +40,7 @@ export default function getConfig({ configPath, cwd }: {
             enabled?: boolean;
             outDir?: string;
             fromTemplates?: string[];
+            prettifyClient?: boolean;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -54,8 +55,8 @@ export default function getConfig({ configPath, cwd }: {
         };
         bundle?: {
             requires?: Record<string, string>;
-            tsClientOutDir?: string;
-            dontDeleteTsClientOutDirAfter?: boolean;
+            prebundleOutDir?: string;
+            keepPrebundleDir?: boolean;
             origin?: string;
             package?: import("type-fest").PackageJson;
             readme?: {

package/dist/getProjectInfo/getConfig/index.mjs

@@ -35,16 +35,18 @@ export default async function getConfig({ configPath, cwd }) {
             enabled: conf.composedClient?.enabled ?? true,
             fromTemplates: conf.composedClient?.fromTemplates ?? ['mjs', 'cjs'],
             outDir: conf.composedClient?.outDir ?? './node_modules/.vovk-client',
+            prettifyClient: conf.composedClient?.prettifyClient ?? false,
         },
         segmentedClient: {
             ...conf.segmentedClient,
             enabled: conf.segmentedClient?.enabled ?? false,
             fromTemplates: conf.segmentedClient?.fromTemplates ?? ['ts'],
             outDir: conf.segmentedClient?.outDir ?? path.join(srcRoot ?? '.', 'client'),
+            prettifyClient: conf.segmentedClient?.prettifyClient ?? true,
         },
         bundle: {
-            tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_prebundle',
-            dontDeleteTsClientOutDirAfter: conf.bundle?.dontDeleteTsClientOutDirAfter ?? false,
+            prebundleOutDir: conf.bundle?.prebundleOutDir ?? 'tmp_prebundle',
+            keepPrebundleDir: conf.bundle?.keepPrebundleDir ?? false,
             requires: {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
@@ -64,8 +66,7 @@ export default async function getConfig({ configPath, cwd }) {
         rootEntry: env.VOVK_ROOT_ENTRY ?? conf.rootEntry ?? 'api',
         rootSegmentModulesDirName: conf.rootSegmentModulesDirName ?? '',
         logLevel: env.VOVK_LOG_LEVEL ?? conf.logLevel ?? 'info',
-        prettifyClient: (env.VOVK_PRETTIFY_CLIENT ? !!env.VOVK_PRETTIFY_CLIENT : null) ?? conf.prettifyClient ?? false,
-        devHttps: (env.VOVK_DEV_HTTPS ? !!env.VOVK_DEV_HTTPS : null) ?? conf.devHttps ?? false,
+        devHttps: conf.devHttps ?? false,
         moduleTemplates: {
             service: 'vovk-cli/module-templates/service.ts.ejs',
             controller: 'vovk-cli/module-templates/controller.ts.ejs',

package/dist/index.mjs

@@ -90,7 +90,7 @@ program
     .option('--prettify', 'prettify output files')
     .option('--schema, --schema-path <path>', 'path to schema folder (default: ./.vovk-schema)')
     .option('--config, --config-path <config>', 'path to config file')
-    .option('--force-ts-standalone', 'force TypeScript standalone mode (Next.js environment will be ignored, by default it\'s "true" for non-Next.js directories)')
+    .option('--origin <url>', 'set the origin URL for the generated client')
     .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema for client generation')
     .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
@@ -113,10 +113,11 @@ program
     .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')
-    .option('--ts-client-out-dir <path>', 'path to output directory for TypeScript client')
-    .option('--dont-delete-ts-client-out-dir-after', 'do not delete TypeScript client output directory after bundling')
+    .option('--prebundle-out-dir, --prebundle-out <path>', 'path to output directory for prebundle')
+    .option('--keep-prebundle-dir', 'do not delete prebundle directory after bundling')
     .option('--config <config>', 'path to config file')
     .option('--schema <path>', 'path to schema folder (default: .vovk-schema)')
+    .option('--origin <url>', 'set the origin URL for the generated client')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema instead of Vovk schema')
     .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
     .option('--openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')

package/dist/init/index.mjs

@@ -8,7 +8,7 @@ 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, { getDevScript } from './updateNPMScripts.mjs';
+import updateNPMScripts, { getBuildScript, getDevScript } from './updateNPMScripts.mjs';
 import checkTSConfigForExperimentalDecorators from './checkTSConfigForExperimentalDecorators.mjs';
 import updateTypeScriptConfig from './updateTypeScriptConfig.mjs';
 import updateDependenciesWithoutInstalling from './updateDependenciesWithoutInstalling.mjs';
@@ -189,18 +189,18 @@ export class Init {
                         ],
                     })));
         updateScripts ??= await select({
-            message: 'Do you want to update "dev" NPM script at package.json?',
+            message: 'Do you want to update "dev" and "build" NPM scripts at package.json?',
             default: 'implicit',
             choices: [
                 {
                     name: 'Yes, use "concurrently" implicitly',
                     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')}"`)}`,
+                    description: `The "dev" 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')}"`)} and the "build" scrilt will run "vovk generate" before "next build" ${chalk.whiteBright.bold(`"${getBuildScript(pkgJson)}"`)}`,
                 },
                 {
                     name: 'Yes, use "concurrently" explicitly',
                     value: 'explicit',
-                    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')}"`)}`,
+                    description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)} and the "build" scrilt will run "vovk generate" before "next build" ${chalk.whiteBright.bold(`"${getBuildScript(pkgJson)}"`)}`,
                 },
                 {
                     name: 'No',

package/dist/init/updateNPMScripts.d.mts

@@ -1,3 +1,4 @@
 import NPMCliPackageJson from '@npmcli/package-json';
 export declare function getDevScript(pkgJson: NPMCliPackageJson, updateScriptsMode: 'implicit' | 'explicit'): string;
+export declare function getBuildScript(pkgJson: NPMCliPackageJson): string;
 export default function updateNPMScripts(pkgJson: NPMCliPackageJson, root: string, updateScriptsMode: 'implicit' | 'explicit'): Promise<void>;

package/dist/init/updateNPMScripts.mjs

@@ -5,11 +5,16 @@ export function getDevScript(pkgJson, updateScriptsMode) {
         ? `PORT=3000 concurrently '${nextDev}' 'vovk dev' --kill-others`
         : `vovk dev --next-dev${nextDevFlags ? ` -- ${nextDevFlags}` : ''}`;
 }
+export function getBuildScript(pkgJson) {
+    const nextBuild = pkgJson.content.scripts?.build ?? 'next build';
+    return `vovk generate && ${nextBuild}`;
+}
 export default async function updateNPMScripts(pkgJson, root, updateScriptsMode) {
     pkgJson.update({
         scripts: {
             ...pkgJson.content.scripts,
             dev: getDevScript(pkgJson, updateScriptsMode),
+            build: getBuildScript(pkgJson),
         },
     });
     await pkgJson.save();

package/dist/types.d.mts

@@ -36,7 +36,7 @@ export interface GenerateOptions {
     segmentedIncludeSegments?: string[];
     segmentedExcludeSegments?: string[];
 }
-export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'], 'tsClientOutDir' | 'dontDeleteTsClientOutDirAfter' | 'includeSegments' | 'excludeSegments'>> {
+export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'], 'prebundleOutDir' | 'keepPrebundleDir' | 'includeSegments' | 'excludeSegments'>> {
     config?: string;
     schema?: string;
     outDir?: string;
@@ -78,8 +78,6 @@ export type VovkEnv = {
     VOVK_ROOT_ENTRY?: string;
     VOVK_API_ENTRY_POINT?: string;
     VOVK_LOG_LEVEL?: LogLevelNames;
-    VOVK_PRETTIFY_CLIENT?: string;
-    VOVK_DEV_HTTPS?: string;
     __VOVK_START_WATCHER_IN_STANDALONE_MODE__?: 'true';
     __VOVK_SCHEMA_OUT_FLAG__?: string;
     __VOVK_DEV_HTTPS_FLAG__?: 'true' | 'false';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.329",
+  "version": "0.0.1-draft.330",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.358"
+    "vovk": "^3.0.0-draft.362"
   },
   "optionalDependencies": {
-    "vovk-python": "^0.0.1-draft.59"
+    "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.31"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",