vovk-cli 0.0.1-draft.7 → 0.0.1-draft.70

package/dist/{watcher → dev}/index.mjs

@@ -1,33 +1,36 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import * as chokidar from 'chokidar';
-import fs from 'fs/promises';
-import getProjectInfo from '../getProjectInfo/index.mjs';
-import path from 'path';
+import { Agent, setGlobalDispatcher } from 'undici';
+import keyBy from 'lodash/keyBy.js';
+import capitalize from 'lodash/capitalize.js';
+import debounce from 'lodash/debounce.js';
+import isEmpty from 'lodash/isEmpty.js';
+import once from 'lodash/once.js';
 import { debouncedEnsureSchemaFiles } from './ensureSchemaFiles.mjs';
 import writeOneSchemaFile from './writeOneSchemaFile.mjs';
 import logDiffResult from './logDiffResult.mjs';
-import generateClient from '../generateClient.mjs';
+import ensureClient from '../generate/ensureClient.mjs';
+import getProjectInfo from '../getProjectInfo/index.mjs';
+import generate from '../generate/index.mjs';
 import locateSegments from '../locateSegments.mjs';
 import debounceWithArgs from '../utils/debounceWithArgs.mjs';
-import debounce from 'lodash/debounce.js';
-import isEmpty from 'lodash/isEmpty.js';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
-import keyBy from 'lodash/keyBy.js';
-import capitalize from 'lodash/capitalize.js';
-import { Agent, setGlobalDispatcher } from 'undici';
-export class VovkCLIWatcher {
+export class VovkDev {
     #projectInfo;
     #segments = [];
     #schemas = {};
     #isWatching = false;
     #modulesWatcher = null;
     #segmentWatcher = null;
-    #watchSegments = () => {
+    #onFirstTimeGenerate = null;
+    #watchSegments = (callback) => {
         const segmentReg = /\/?\[\[\.\.\.[a-zA-Z-_]+\]\]\/route.ts$/;
         const { cwd, log, config, apiDir } = this.#projectInfo;
         const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
         const apiDirAbsolutePath = path.join(cwd, apiDir);
         const getSegmentName = (filePath) => path.relative(apiDirAbsolutePath, filePath).replace(segmentReg, '');
-        log.debug(`Watching segments in ${apiDirAbsolutePath}`);
+        log.debug(`Watching segments at ${apiDirAbsolutePath}`);
         this.#segmentWatcher = chokidar
             .watch(apiDirAbsolutePath, {
             persistent: true,
@@ -39,7 +42,14 @@ export class VovkCLIWatcher {
                 const segmentName = getSegmentName(filePath);
                 this.#segments = this.#segments.find((s) => s.segmentName === segmentName)
                     ? this.#segments
-                    : [...this.#segments, { routeFilePath: filePath, segmentName }];
+                    : [
+                        ...this.#segments,
+                        {
+                            routeFilePath: filePath,
+                            segmentName,
+                            segmentImportPath: path.relative(config.clientOutDir, filePath), // TODO DRY locateSegments
+                        },
+                    ];
                 log.info(`${capitalize(formatLoggedSegmentName(segmentName))} has been added`);
                 log.debug(`Full list of segments: ${this.#segments.map((s) => s.segmentName).join(', ')}`);
                 void debouncedEnsureSchemaFiles(this.#projectInfo, schemaOutAbsolutePath, this.#segments.map((s) => s.segmentName));
@@ -53,14 +63,14 @@ export class VovkCLIWatcher {
         })
             .on('addDir', async (dirPath) => {
             log.debug(`Directory ${dirPath} has been added to segments folder`);
-            this.#segments = await locateSegments(apiDirAbsolutePath);
+            this.#segments = await locateSegments({ dir: apiDirAbsolutePath, config });
             for (const { segmentName } of this.#segments) {
                 void this.#requestSchema(segmentName);
             }
         })
             .on('unlinkDir', async (dirPath) => {
             log.debug(`Directory ${dirPath} has been removed from segments folder`);
-            this.#segments = await locateSegments(apiDirAbsolutePath);
+            this.#segments = await locateSegments({ dir: apiDirAbsolutePath, config });
             for (const { segmentName } of this.#segments) {
                 void this.#requestSchema(segmentName);
             }
@@ -76,16 +86,17 @@ export class VovkCLIWatcher {
             }
         })
             .on('ready', () => {
+            callback();
             log.debug('Segments watcher is ready');
         })
             .on('error', (error) => {
             log.error(`Error watching segments folder: ${error?.message ?? 'Unknown error'}`);
         });
     };
-    #watchModules = () => {
+    #watchModules = (callback) => {
         const { config, cwd, log } = this.#projectInfo;
         const modulesDirAbsolutePath = path.join(cwd, config.modulesDir);
-        log.debug(`Watching modules in ${modulesDirAbsolutePath}`);
+        log.debug(`Watching modules at ${modulesDirAbsolutePath}`);
         const processControllerChange = debounceWithArgs(this.#processControllerChange, 500);
         this.#modulesWatcher = chokidar
             .watch(modulesDirAbsolutePath, {
@@ -114,30 +125,45 @@ export class VovkCLIWatcher {
             }
         })
             .on('ready', () => {
+            callback();
             log.debug('Modules watcher is ready');
         })
             .on('error', (error) => {
             log.error(`Error watching modules folder: ${error?.message ?? 'Unknown error'}`);
         });
     };
-    #watchConfig = () => {
+    #watchConfig = (callback) => {
         const { log, cwd } = this.#projectInfo;
         log.debug(`Watching config files`);
         let isInitial = true;
         let isReady = false;
         const handle = debounce(async () => {
             this.#projectInfo = await getProjectInfo();
-            if (!isInitial) {
-                log.info('Config file has been updated');
-                isInitial = false;
-            }
             await this.#modulesWatcher?.close();
             await this.#segmentWatcher?.close();
-            this.#watchModules();
-            this.#watchSegments();
+            await Promise.all([
+                new Promise((resolve) => this.#watchModules(() => resolve(0))),
+                new Promise((resolve) => this.#watchSegments(() => resolve(0))),
+            ]);
+            if (isInitial) {
+                callback();
+            }
+            else {
+                log.info('Config file has been updated');
+                this.#generate();
+            }
+            isInitial = false;
         }, 1000);
         chokidar
-            .watch(['vovk.config.{js,mjs,cjs}', '.config/vovk.config.{js,mjs,cjs}'], {
+            // .watch(['vovk.config.{js,mjs,cjs}', '.config/vovk.config.{js,mjs,cjs}'], {
+            .watch([
+            'vovk.config.js',
+            'vovk.config.mjs',
+            'vovk.config.cjs',
+            '.config/vovk.config.js',
+            '.config/vovk.config.mjs',
+            '.config/vovk.config.cjs',
+        ], {
             persistent: true,
             cwd,
             ignoreInitial: false,
@@ -156,13 +182,14 @@ export class VovkCLIWatcher {
             .on('error', (error) => log.error(`Error watching config files: ${error?.message ?? 'Unknown error'}`));
         void handle();
     };
-    #watch() {
+    async #watch(callback) {
         if (this.#isWatching)
             throw new Error('Already watching');
         const { log } = this.#projectInfo;
         log.debug(`Starting segments and modules watcher. Detected initial segments: ${JSON.stringify(this.#segments.map((s) => s.segmentName))}.`);
+        await ensureClient(this.#projectInfo);
         // automatically watches segments and modules
-        this.#watchConfig();
+        this.#watchConfig(callback);
     }
     #processControllerChange = async (filePath) => {
         const { log } = this.#projectInfo;
@@ -173,53 +200,59 @@ export class VovkCLIWatcher {
         }
         const nameOfClasReg = /\bclass\s+([A-Za-z_]\w*)(?:\s*<[^>]*>)?\s*\{/g;
         const namesOfClasses = [...code.matchAll(nameOfClasReg)].map((match) => match[1]);
-        const importRegex = /import\s*{[^}]*\b(get|post|put|del|head|options|worker)\b[^}]*}\s*from\s*['"]vovk['"]/;
+        const importRegex = /import\s*{[^}]*\b(get|post|put|del|head|options)\b[^}]*}\s*from\s*['"]vovk['"]/;
         if (importRegex.test(code) && namesOfClasses.length) {
             const affectedSegments = this.#segments.filter((s) => {
                 const schema = this.#schemas[s.segmentName];
                 if (!schema)
                     return false;
-                const controllersByOriginalName = keyBy(schema.controllers, '_originalControllerName');
-                const workersByOriginalName = keyBy(schema.workers, '_originalWorkerName');
-                return namesOfClasses.some((name) => schema.controllers[name] ||
-                    schema.workers[name] ||
-                    controllersByOriginalName[name] ||
-                    workersByOriginalName[name]);
+                const controllersByOriginalName = keyBy(schema.controllers, 'originalControllerName');
+                return namesOfClasses.some((name) => schema.controllers[name] || controllersByOriginalName[name]);
             });
             if (affectedSegments.length) {
-                log.debug(`A file with controller or worker ${namesOfClasses.join(', ')} have been modified at path "${filePath}". Segment(s) affected: ${JSON.stringify(affectedSegments.map((s) => s.segmentName))}`);
+                log.debug(`A file with controller ${namesOfClasses.join(', ')} have been modified at path "${filePath}". Segment(s) affected: ${JSON.stringify(affectedSegments.map((s) => s.segmentName))}`);
                 for (const segment of affectedSegments) {
                     await this.#requestSchema(segment.segmentName);
                 }
             }
+            else {
+                log.debug(`The class ${namesOfClasses.join(', ')} does not belong to any segment`);
+            }
         }
         else {
-            log.debug(`The file does not contain any controller or worker`);
+            log.debug(`The file does not contain any controller`);
         }
     };
     #requestSchema = debounceWithArgs(async (segmentName) => {
-        const { apiEntryPoint, log, port, config } = this.#projectInfo;
+        const { apiRoot, log, port, config } = this.#projectInfo;
         const { devHttps } = config;
-        const endpoint = `${apiEntryPoint.startsWith(`http${devHttps ? 's' : ''}://`) ? apiEntryPoint : `http${devHttps ? 's' : ''}://localhost:${port}${apiEntryPoint}`}/${segmentName ? `${segmentName}/` : ''}_schema_`;
+        const endpoint = `${apiRoot.startsWith(`http${devHttps ? 's' : ''}://`) ? apiRoot : `http${devHttps ? 's' : ''}://localhost:${port}${apiRoot}`}/${segmentName ? `${segmentName}/` : ''}_schema_`;
         log.debug(`Requesting schema for ${formatLoggedSegmentName(segmentName)} at ${endpoint}`);
-        const resp = await fetch(endpoint);
-        if (resp.status !== 200) {
-            const probableCause = {
-                404: 'The segment is not compiled.',
-                500: 'Syntax error in one of controllers.',
-            }[resp.status];
-            log.warn(`Schema request to ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status} but expected 200.${probableCause ? ` Probable cause: ${probableCause}` : ''}`);
-            return;
-        }
-        let schema = null;
         try {
-            ({ schema } = (await resp.json()));
+            const resp = await fetch(endpoint);
+            if (resp.status !== 200) {
+                const probableCause = {
+                    404: 'The segment did not compile or config.origin is wrong.',
+                }[resp.status];
+                log.warn(`Schema request to ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status} but expected 200.${probableCause ? ` Probable cause: ${probableCause}` : ''}`);
+                return { isError: true };
+            }
+            let schema = null;
+            try {
+                ({ schema } = (await resp.json()));
+            }
+            catch (error) {
+                log.error(`Error parsing schema for ${formatLoggedSegmentName(segmentName)}: ${error.message}`);
+            }
+            await this.#handleSchema(schema);
         }
         catch (error) {
-            log.error(`Error parsing schema for ${formatLoggedSegmentName(segmentName)}: ${error.message}`);
+            log.error(`Error requesting schema for ${formatLoggedSegmentName(segmentName)} at ${endpoint}: ${error.message}`);
+            return { isError: true };
         }
-        await this.#handleSchema(schema);
+        return { isError: false };
     }, 500);
+    #generate = debounce(() => generate({ projectInfo: this.#projectInfo, segments: this.#segments, segmentsSchema: this.#schemas }).then(this.#onFirstTimeGenerate), 1000);
     async #handleSchema(schema) {
         const { log, config, cwd } = this.#projectInfo;
         if (!schema) {
@@ -247,17 +280,24 @@ export class VovkCLIWatcher {
                 log.info(`Schema for ${formatLoggedSegmentName(segment.segmentName)} has been updated in ${timeTook}ms`);
             }
         }
-        else if (schema && (!isEmpty(schema.controllers) || !isEmpty(schema.workers))) {
-            log.error(`Non-empty schema provided for ${formatLoggedSegmentName(segment.segmentName)} but emitSchema is false`);
+        else if (schema && !isEmpty(schema.controllers)) {
+            log.error(`Non-empty schema provided for ${formatLoggedSegmentName(segment.segmentName)} but "emitSchema" is false`);
         }
         if (this.#segments.every((s) => this.#schemas[s.segmentName])) {
             log.debug(`All segments with "emitSchema" have schema.`);
-            await generateClient(this.#projectInfo, this.#segments, this.#schemas);
+            this.#generate();
         }
     }
-    async start({ clientOutDir } = {}) {
-        this.#projectInfo = await getProjectInfo({ clientOutDir });
+    async start({ exit }) {
+        const now = Date.now();
+        this.#projectInfo = await getProjectInfo();
         const { log, config, cwd, apiDir } = this.#projectInfo;
+        log.info('Starting...');
+        if (exit) {
+            this.#onFirstTimeGenerate = once(() => {
+                log.info('The schemas and the RPC client have been generated. Exiting...');
+            });
+        }
         if (config.devHttps) {
             const agent = new Agent({
                 connect: {
@@ -274,18 +314,45 @@ export class VovkCLIWatcher {
         });
         const apiDirAbsolutePath = path.join(cwd, apiDir);
         const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
-        this.#segments = await locateSegments(apiDirAbsolutePath);
+        this.#segments = await locateSegments({ dir: apiDirAbsolutePath, config });
         await debouncedEnsureSchemaFiles(this.#projectInfo, schemaOutAbsolutePath, this.#segments.map((s) => s.segmentName));
-        // Request schema every segment in 5 seconds in order to update schema and start watching
+        const MAX_ATTEMPTS = 5;
+        const DELAY = 5000;
+        // Request schema every segment in 5 seconds in order to update schema on start
         setTimeout(() => {
             for (const { segmentName } of this.#segments) {
-                void this.#requestSchema(segmentName);
+                let attempts = 0;
+                void this.#requestSchema(segmentName).then(({ isError }) => {
+                    if (isError) {
+                        const interval = setInterval(() => {
+                            attempts++;
+                            if (attempts >= MAX_ATTEMPTS) {
+                                clearInterval(interval);
+                                log.error(`Failed to request schema for ${formatLoggedSegmentName(segmentName)} after ${MAX_ATTEMPTS} attempts`);
+                                return;
+                            }
+                            void this.#requestSchema(segmentName).then(({ isError: isError2 }) => {
+                                if (!isError2) {
+                                    clearInterval(interval);
+                                    log.info(`Requested schema for ${formatLoggedSegmentName(segmentName)} after ${attempts} attempts`);
+                                }
+                            });
+                        }, DELAY);
+                    }
+                });
             }
-            this.#watch();
-        }, 5000);
+        }, DELAY);
+        if (!exit) {
+            this.#watch(() => {
+                log.info(`Ready in ${Date.now() - now}ms. Making initial requests for schemas in a moment...`);
+            });
+        }
+        else {
+            log.info(`Ready in ${Date.now() - now}ms. Making requests for schemas in a moment...`);
+        }
     }
 }
 const env = process.env;
 if (env.__VOVK_START_WATCHER_IN_STANDALONE_MODE__ === 'true') {
-    void new VovkCLIWatcher().start();
+    void new VovkDev().start({ exit: env.__VOVK_EXIT__ === 'true' });
 }

package/dist/{watcher → dev}/isMetadataEmpty.mjs

@@ -1,4 +1,4 @@
 import isEmpty from 'lodash/isEmpty.js';
 export default function isSchemaEmpty(schema) {
-    return isEmpty(schema.controllers) && isEmpty(schema.workers);
+    return isEmpty(schema.controllers);
 }

package/dist/{watcher → dev}/logDiffResult.d.mts

@@ -1,3 +1,3 @@
-import { ProjectInfo } from '../getProjectInfo/index.mjs';
-import { DiffResult } from './diffSchema.mjs';
+import type { DiffResult } from './diffSchema.mjs';
+import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 export default function logDiffResult(segmentName: string, diffResult: DiffResult, projectInfo: ProjectInfo): void;

package/dist/dev/logDiffResult.mjs

@@ -0,0 +1,57 @@
+import chalk from 'chalk';
+import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
+import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
+export default function logDiffResult(segmentName, diffResult, projectInfo) {
+    const diffNormalized = [];
+    diffResult.controllers.added.forEach((name) => {
+        diffNormalized.push({ what: 'controller', type: 'added', name });
+    });
+    diffResult.controllers.removed.forEach((name) => {
+        diffNormalized.push({ what: 'controller', type: 'removed', name });
+    });
+    diffResult.controllers.handlers.forEach((handler) => {
+        handler.added.forEach((name) => {
+            diffNormalized.push({ what: 'controllerHandler', type: 'added', name: `${handler.nameOfClass}.${name}` });
+        });
+        handler.removed.forEach((name) => {
+            diffNormalized.push({ what: 'controllerHandler', type: 'removed', name: `${handler.nameOfClass}.${name}` });
+        });
+        handler.changed.forEach((name) => {
+            diffNormalized.push({ what: 'controllerHandler', type: 'changed', name: `${handler.nameOfClass}.${name}` });
+        });
+    });
+    const LIMIT = diffNormalized.length < 12 ? diffNormalized.length : 10;
+    const addedText = chalk.green('added');
+    const removedText = chalk.red('removed');
+    const changedText = chalk.cyan('changed');
+    for (const diffNormalizedItem of diffNormalized.slice(0, LIMIT)) {
+        switch (diffNormalizedItem.what) {
+            case 'controller':
+                switch (diffNormalizedItem.type) {
+                    case 'added':
+                        projectInfo.log.info(`Schema for RPC ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
+                        break;
+                    case 'removed':
+                        projectInfo.log.info(`Schema for RPC ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
+                        break;
+                }
+                break;
+            case 'controllerHandler':
+                switch (diffNormalizedItem.type) {
+                    case 'added':
+                        projectInfo.log.info(`Schema for RPC method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
+                        break;
+                    case 'removed':
+                        projectInfo.log.info(`Schema for RPC method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
+                        break;
+                    case 'changed':
+                        projectInfo.log.info(`Schema for RPC method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${changedText} at ${formatLoggedSegmentName(segmentName)}`);
+                        break;
+                }
+                break;
+        }
+    }
+    if (diffNormalized.length > LIMIT) {
+        projectInfo.log.info(`... and ${diffNormalized.length - LIMIT} more changes`);
+    }
+}

package/dist/{watcher → dev}/writeOneSchemaFile.d.mts

@@ -1,5 +1,5 @@
 import type { VovkSchema } from 'vovk';
-import { DiffResult } from './diffSchema.mjs';
+import { type DiffResult } from './diffSchema.mjs';
 export declare const ROOT_SEGMENT_SCHEMA_NAME = "_root";
 export default function writeOneSchemaFile({ schemaOutAbsolutePath, schema, skipIfExists, }: {
     schemaOutAbsolutePath: string;

package/dist/{watcher → dev}/writeOneSchemaFile.mjs

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 import diffSchema from './diffSchema.mjs';
 import getFileSystemEntryType from '../utils/getFileSystemEntryType.mjs';
 export const ROOT_SEGMENT_SCHEMA_NAME = '_root';

package/dist/generate/ensureClient.d.mts

@@ -0,0 +1,5 @@
+import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+export default function ensureClient({ config, cwd, log }: ProjectInfo): Promise<{
+    written: boolean;
+    path: string;
+}>;

package/dist/generate/ensureClient.mjs

@@ -0,0 +1,27 @@
+import fs from 'node:fs/promises';
+import getClientTemplates from './getClientTemplates.mjs';
+export default async function ensureClient({ config, cwd, log }) {
+    const now = Date.now();
+    const { clientOutDirAbsolutePath, templateFiles } = getClientTemplates({
+        config,
+        cwd,
+        templateNames: config.experimental_clientGenerateTemplateNames,
+    });
+    const text = `// auto-generated ${new Date().toISOString()}
+// This is a temporary placeholder to avoid errors if client is imported before it's generated.
+// If you still see this text, the client is not generated yet because of an unknown problem.
+// Feel free to report an issue at https://github.com/finom/vovk/issues`;
+    let written = false;
+    for (const { outPath } of templateFiles) {
+        const existing = await fs.readFile(outPath, 'utf-8').catch(() => null);
+        if (!existing) {
+            await fs.mkdir(clientOutDirAbsolutePath, { recursive: true });
+            await fs.writeFile(outPath, text);
+            written = true;
+        }
+    }
+    if (written) {
+        log.info(`Empty client files are generated in ${Date.now() - now}ms`);
+    }
+    return { written, path: clientOutDirAbsolutePath };
+}

package/dist/generate/getClientTemplates.d.mts

@@ -0,0 +1,14 @@
+import { VovkConfig } from '../types.mjs';
+interface ClientTemplate {
+    templatePath: string;
+    outPath: string;
+}
+export default function getClientTemplates({ config, cwd, templateNames, }: {
+    config: Required<VovkConfig>;
+    cwd: string;
+    templateNames?: string[];
+}): {
+    clientOutDirAbsolutePath: string;
+    templateFiles: ClientTemplate[];
+};
+export {};

package/dist/generate/getClientTemplates.mjs

@@ -0,0 +1,28 @@
+import path from 'node:path';
+export default function getClientTemplates({ config, cwd, templateNames = [], }) {
+    const templatesDir = path.join(import.meta.dirname, '../..', 'client-templates');
+    const clientOutDirAbsolutePath = path.resolve(cwd, config.clientOutDir);
+    const mapper = (dir) => (name) => ({
+        templatePath: path.resolve(templatesDir, dir, name),
+        outPath: path.join(clientOutDirAbsolutePath, name.replace('.ejs', '')),
+    });
+    const builtInTemplatesMap = {
+        ts: ['index.ts.ejs'].map(mapper('ts')),
+        main: ['main.cjs.ejs', 'main.d.cts.ejs'].map(mapper('main')),
+        module: ['module.mjs.ejs', 'module.d.mts.ejs'].map(mapper('module')),
+        python: ['__init__.py'].map(mapper('python')),
+    };
+    const templateFiles = (templateNames ?? config.experimental_clientGenerateTemplateNames).reduce((acc, template) => {
+        if (template in builtInTemplatesMap) {
+            return [...acc, ...builtInTemplatesMap[template]];
+        }
+        return [
+            ...acc,
+            {
+                templatePath: path.resolve(cwd, template),
+                outPath: path.join(clientOutDirAbsolutePath, path.basename(template).replace('.ejs', '')),
+            },
+        ];
+    }, []);
+    return { clientOutDirAbsolutePath, templateFiles };
+}

package/dist/generate/index.d.mts

@@ -0,0 +1,13 @@
+import type { VovkSchema } from 'vovk';
+import type { ProjectInfo } from '../getProjectInfo/index.mjs';
+import type { Segment } from '../locateSegments.mjs';
+import { GenerateOptions } from '../types.mjs';
+export default function generate({ projectInfo, segments, segmentsSchema, forceNothingWrittenLog, templates, prettify: prettifyClient, fullSchema, }: {
+    projectInfo: ProjectInfo;
+    segments: Segment[];
+    segmentsSchema: Record<string, VovkSchema>;
+    forceNothingWrittenLog?: boolean;
+} & Pick<GenerateOptions, 'templates' | 'prettify' | 'fullSchema'>): Promise<{
+    written: boolean;
+    path: string;
+}>;

package/dist/generate/index.mjs

@@ -0,0 +1,80 @@
+import path from 'node:path';
+import fs from 'node:fs/promises';
+import ejs from 'ejs';
+import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
+import prettify from '../utils/prettify.mjs';
+import getClientTemplates from './getClientTemplates.mjs';
+export default async function generate({ projectInfo, segments, segmentsSchema, forceNothingWrittenLog, templates, prettify: prettifyClient, fullSchema, }) {
+    templates = templates ?? projectInfo.config.experimental_clientGenerateTemplateNames;
+    const noClient = templates?.[0] === 'none';
+    const { config, cwd, log, clientImports, apiRoot } = projectInfo;
+    const { clientOutDirAbsolutePath, templateFiles } = getClientTemplates({ config, cwd, templateNames: templates });
+    // Ensure that each segment has a matching schema if it needs to be emitted:
+    for (let i = 0; i < segments.length; i++) {
+        const { segmentName } = segments[i];
+        const schema = segmentsSchema[segmentName];
+        if (!schema) {
+            throw new Error(`Unable to generate client. No schema found for ${formatLoggedSegmentName(segmentName)}`);
+        }
+        if (!schema.emitSchema)
+            continue;
+    }
+    const now = Date.now();
+    // Data for the EJS templates:
+    const template = {
+        apiRoot,
+        imports: clientImports,
+        segments,
+        fullSchema: segmentsSchema,
+    };
+    // Process each template in parallel
+    const processedTemplates = noClient
+        ? []
+        : await Promise.all(templateFiles.map(async ({ templatePath, outPath }) => {
+            // Read the EJS template
+            const templateContent = await fs.readFile(templatePath, 'utf-8');
+            // Render the template
+            let rendered = templatePath.endsWith('.ejs')
+                ? ejs.render(templateContent, { template }, {
+                    filename: templatePath,
+                })
+                : templateContent;
+            // Optionally prettify
+            if (prettifyClient || config.prettifyClient) {
+                rendered = await prettify(rendered, outPath);
+            }
+            // Read existing file content to compare
+            const existingContent = await fs.readFile(outPath, 'utf-8').catch(() => '');
+            // Determine if we need to rewrite the file
+            const needsWriting = existingContent !== rendered;
+            return {
+                outPath,
+                rendered,
+                needsWriting,
+            };
+        }));
+    const anyNeedsWriting = processedTemplates.some(({ needsWriting }) => needsWriting);
+    if (fullSchema || anyNeedsWriting) {
+        // Make sure the output directory exists
+        await fs.mkdir(clientOutDirAbsolutePath, { recursive: true });
+    }
+    if (fullSchema) {
+        const fullSchemaOutAbsolutePath = path.resolve(clientOutDirAbsolutePath, typeof fullSchema === 'string' ? fullSchema : 'full-schema.json');
+        await fs.writeFile(fullSchemaOutAbsolutePath, JSON.stringify(segmentsSchema, null, 2));
+        log.info(`Full schema has ben written to ${fullSchemaOutAbsolutePath}`);
+    }
+    if (!anyNeedsWriting) {
+        const logOrDebug = forceNothingWrittenLog ? log.info : log.debug;
+        logOrDebug(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
+        return { written: false, path: clientOutDirAbsolutePath };
+    }
+    // Write updated files where needed
+    await Promise.all(processedTemplates.map(({ outPath, rendered, needsWriting }) => {
+        if (needsWriting) {
+            return fs.writeFile(outPath, rendered);
+        }
+        return null;
+    }));
+    log.info(`Client generated in ${Date.now() - now}ms`);
+    return { written: true, path: clientOutDirAbsolutePath };
+}

package/dist/getProjectInfo/getConfig.d.mts

@@ -1,11 +1,11 @@
-import type { VovkConfig } from '../types.mjs';
+import type { VovkStrictConfig } from '../types.mjs';
 export default function getConfig({ clientOutDir, cwd }: {
     clientOutDir?: string;
     cwd: string;
 }): Promise<{
-    config: Required<VovkConfig>;
+    config: VovkStrictConfig;
     srcRoot: string;
     configAbsolutePaths: string[];
-    userConfig: VovkConfig | null;
+    userConfig: import("../types.mjs").VovkConfig | null;
     error: Error | undefined;
 }>;

package/dist/getProjectInfo/getConfig.mjs

@@ -5,23 +5,26 @@ export default async function getConfig({ clientOutDir, cwd }) {
     const { configAbsolutePaths, error, userConfig } = await getUserConfig({ cwd });
     const conf = userConfig ?? {};
     const srcRoot = await getRelativeSrcRoot({ cwd });
+    const validateOnClientImport = env.VOVK_VALIDATE_ON_CLIENT_PATH ?? conf.validateOnClientImport ?? null;
+    const fetcherImport = env.VOVK_FETCHER_PATH ?? conf.fetcherImport ?? 'vovk/dist/client/defaultFetcher.js';
+    const createRPCImport = env.VOVK_CREATE_RPC_PATH ?? conf.createRPCImport ?? 'vovk/dist/client/createRPC.js';
     const config = {
         modulesDir: env.VOVK_MODULES_DIR ?? conf.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
-        validateOnClient: env.VOVK_VALIDATE_ON_CLIENT ?? conf.validateOnClient ?? null,
-        validationLibrary: env.VOVK_VALIDATION_LIBRARY ?? conf.validationLibrary ?? null,
-        fetcher: env.VOVK_FETCHER ?? conf.fetcher ?? 'vovk/client/defaultFetcher',
+        validateOnClientImport: typeof validateOnClientImport === 'string' ? [validateOnClientImport] : validateOnClientImport,
+        fetcherImport: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
+        createRPCImport: typeof createRPCImport === 'string' ? [createRPCImport] : createRPCImport,
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',
         clientOutDir: clientOutDir ?? env.VOVK_CLIENT_OUT_DIR ?? conf.clientOutDir ?? './node_modules/.vovk-client',
         origin: (env.VOVK_ORIGIN ?? conf.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
         rootEntry: env.VOVK_ROOT_ENTRY ?? conf.rootEntry ?? 'api',
         rootSegmentModulesDirName: env.VOVK_ROOT_SEGMENT_MODULES_DIR_NAME ?? conf.rootSegmentModulesDirName ?? '',
-        logLevel: env.VOVK_LOG_LEVEL ?? conf.logLevel ?? 'debug', // TODO: change to 'warn' when v3 is ready
+        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,
+        experimental_clientGenerateTemplateNames: conf.experimental_clientGenerateTemplateNames ?? ['ts', 'module', 'main'],
         templates: {
             service: 'vovk-cli/templates/service.ejs',
             controller: 'vovk-cli/templates/controller.ejs',
-            worker: 'vovk-cli/templates/worker.ejs',
             ...conf.templates,
         },
     };