vovk-cli 0.0.1-draft.36 → 0.0.1-draft.38

package/dist/dev/index.mjs

@@ -22,7 +22,7 @@ export class VovkDev {
     #isWatching = false;
     #modulesWatcher = null;
     #segmentWatcher = null;
-    #watchSegments = () => {
+    #watchSegments = (callback) => {
         const segmentReg = /\/?\[\[\.\.\.[a-zA-Z-_]+\]\]\/route.ts$/;
         const { cwd, log, config, apiDir } = this.#projectInfo;
         const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
@@ -77,13 +77,14 @@ export class VovkDev {
             }
         })
             .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 at ${modulesDirAbsolutePath}`);
@@ -115,30 +116,37 @@ export class VovkDev {
             }
         })
             .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) {
+            await this.#modulesWatcher?.close();
+            await this.#segmentWatcher?.close();
+            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');
             }
             isInitial = false;
-            await this.#modulesWatcher?.close();
-            await this.#segmentWatcher?.close();
-            this.#watchModules();
-            this.#watchSegments();
         }, 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,
@@ -157,15 +165,14 @@ export class VovkDev {
             .on('error', (error) => log.error(`Error watching config files: ${error?.message ?? 'Unknown error'}`));
         void handle();
     };
-    async #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();
-        log.info('Vovk Dev Watcher is ready');
+        this.#watchConfig(callback);
     }
     #processControllerChange = async (filePath) => {
         const { log } = this.#projectInfo;
@@ -208,22 +215,29 @@ export class VovkDev {
         const { devHttps } = config;
         const endpoint = `${apiEntryPoint.startsWith(`http${devHttps ? 's' : ''}://`) ? apiEntryPoint : `http${devHttps ? 's' : ''}://localhost:${port}${apiEntryPoint}`}/${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 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;
-        }
-        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)}: ${error.message}`);
+            return { isError: true };
         }
-        await this.#handleSchema(schema);
+        return { isError: false };
     }, 500);
     async #handleSchema(schema) {
         const { log, config, cwd } = this.#projectInfo;
@@ -261,6 +275,7 @@ export class VovkDev {
         }
     }
     async start() {
+        const now = Date.now();
         this.#projectInfo = await getProjectInfo();
         const { log, config, cwd, apiDir } = this.#projectInfo;
         if (config.devHttps) {
@@ -284,9 +299,29 @@ export class VovkDev {
         // Request schema every segment in 5 seconds in order to update schema and start watching
         setTimeout(() => {
             for (const { segmentName } of this.#segments) {
-                void this.#requestSchema(segmentName);
+                const MAX_ATTEMPTS = 3;
+                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);
+                                }
+                            });
+                        }, 5000);
+                    }
+                });
             }
-            this.#watch();
+            this.#watch(() => {
+                log.info(`Ready in ${Date.now() - now}ms`);
+            });
         }, 5000);
     }
 }

package/dist/index.d.mts

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import type { VovkConfig, VovkDevEnv } from './types.mjs';
 import 'dotenv/config';
-export type { VovkConfig, VovkDevEnv };
+import type { VovkConfig, VovkEnv } from './types.mjs';
+export type { VovkConfig, VovkEnv };

package/dist/index.mjs

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 import path from 'node:path';
 import { readFileSync } from 'node:fs';
+import { pathToFileURL } from 'node:url';
+import 'dotenv/config';
 import { Command } from 'commander';
 import concurrently from 'concurrently';
 import getAvailablePort from './utils/getAvailablePort.mjs';
@@ -9,9 +11,7 @@ import generateClient from './generateClient.mjs';
 import locateSegments from './locateSegments.mjs';
 import { VovkDev } from './dev/index.mjs';
 import newComponents from './new/index.mjs';
-import 'dotenv/config';
 import initProgram from './initProgram.mjs';
-import { pathToFileURL } from 'node:url';
 const program = new Command();
 const packageJSON = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
 program.name('vovk').description('Vovk CLI').version(packageJSON.version);

package/dist/init/index.mjs

@@ -7,16 +7,17 @@ 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 from './updateNPMScripts.mjs';
+import updateNPMScripts, { getDevScript } from './updateNPMScripts.mjs';
 import checkTSConfigForExperimentalDecorators from './checkTSConfigForExperimentalDecorators.mjs';
 import updateTypeScriptConfig from './updateTypeScriptConfig.mjs';
 import updateDependenciesWithoutInstalling from './updateDependenciesWithoutInstalling.mjs';
 import logUpdateDependenciesError from './logUpdateDependenciesError.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
+import NPMCliPackageJson from '@npmcli/package-json';
 export class Init {
     root;
     log;
-    async #init({ configPaths, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, dryRun, channel, }) {
+    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, dryRun, channel, }) {
         const { log, root } = this;
         const dependencies = ['vovk', 'vovk-client'];
         const devDependencies = ['vovk-cli'];
@@ -30,13 +31,13 @@ export class Init {
             dependencies.push(...({
                 'vovk-zod': ['zod'],
                 'vovk-yup': ['yup'],
-                'vovk-dto': ['class-validator', 'class-transformer'],
+                'vovk-dto': ['class-validator', 'class-transformer', 'vovk-mapped-types', 'reflect-metadata'],
             }[validationLibrary] ?? []));
         }
         if (updateScripts) {
             try {
                 if (!dryRun)
-                    await updateNPMScripts(root, updateScripts);
+                    await updateNPMScripts(pkgJson, root, updateScripts);
                 log.info('Updated scripts at package.json');
             }
             catch (error) {
@@ -113,11 +114,12 @@ export class Init {
         const cwd = process.cwd();
         const root = path.resolve(cwd, prefix);
         const log = getLogger(logLevel);
+        const pkgJson = await NPMCliPackageJson.load(root);
         this.root = root;
         this.log = log;
         const configPaths = await getConfigPaths({ cwd, relativePath: prefix });
         if (yes) {
-            return this.#init({ configPaths }, {
+            return this.#init({ configPaths, pkgJson }, {
                 useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
                 useYarn: useYarn ?? false,
                 usePnpm: usePnpm ?? false,
@@ -164,7 +166,7 @@ export class Init {
                             {
                                 name: 'vovk-dto',
                                 value: 'vovk-dto',
-                                description: 'Use class-validator and class-transformer for data validation',
+                                description: 'Use class-validator for data validation. Also installs class-transformer, vovk-mapped-types and reflect-metadata',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
@@ -185,12 +187,12 @@ export class Init {
                         {
                             name: 'Yes, use "concurrently" implicitly',
                             value: '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(`"vovk dev --next-dev"`)}`,
+                            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')}"`)}`,
                         },
                         {
                             name: 'Yes, use "concurrently" explicitly',
                             value: '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(`"PORT=3000 concurrently 'next dev' 'vovk dev' --kill-others"`)}`,
+                            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')}"`)}`,
                         },
                         {
                             name: 'No',
@@ -213,7 +215,7 @@ export class Init {
                 });
             }
         }
-        await this.#init({ configPaths }, {
+        await this.#init({ configPaths, pkgJson }, {
             useNpm: useNpm ?? (!useYarn && !usePnpm && !useBun),
             useYarn: useYarn ?? false,
             usePnpm: usePnpm ?? false,

package/dist/init/updateNPMScripts.d.mts

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

package/dist/init/updateNPMScripts.mjs

@@ -1,13 +1,16 @@
-import NPMCliPackageJson from '@npmcli/package-json';
-export default async function updateNPMScripts(root, updateScriptsMode) {
-    const pkgJson = await NPMCliPackageJson.load(root);
+export function getDevScript(pkgJson, updateScriptsMode) {
+    const nextDev = pkgJson.content.scripts?.dev ?? 'next dev';
+    const nextDevFlags = nextDev.replace('next dev', '').trim();
+    return updateScriptsMode === 'explicit'
+        ? `PORT=3000 concurrently '${nextDev}' 'vovk dev' --kill-others`
+        : `vovk dev --next-dev${nextDevFlags ? ` -- ${nextDevFlags}` : ''}`;
+}
+export default async function updateNPMScripts(pkgJson, root, updateScriptsMode) {
     pkgJson.update({
         scripts: {
             ...pkgJson.content.scripts,
             generate: 'vovk generate',
-            dev: updateScriptsMode === 'explicit'
-                ? "PORT=3000 concurrently 'next dev' 'vovk dev' --kill-others"
-                : 'vovk dev --next-dev',
+            dev: getDevScript(pkgJson, updateScriptsMode),
         },
     });
     await pkgJson.save();

package/dist/new/newSegment.mjs

@@ -29,5 +29,5 @@ ${segmentName ? `  segmentName: '${segmentName}',\n` : ''}  emitSchema: true,
         await fs.mkdir(path.dirname(absoluteSegmentRoutePath), { recursive: true });
         await fs.writeFile(absoluteSegmentRoutePath, code);
     }
-    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} created at ${absoluteSegmentRoutePath}. Run ${chalkHighlightThing(`vovk new controller ${[segmentName, 'someName'].filter(Boolean).join('/')}`)} to create a new controller`);
+    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} created at ${absoluteSegmentRoutePath}. Run ${chalkHighlightThing(`vovk new controller ${[segmentName, 'thing'].filter(Boolean).join('/')}`)} to create a new controller`);
 }

package/dist/types.d.mts

@@ -1,6 +1,6 @@
 import type { LogLevelNames } from 'loglevel';
 export type KnownAny = any;
-export type VovkDevEnv = {
+export type VovkEnv = {
     PORT?: string;
     VOVK_CLIENT_OUT_DIR?: string;
     VOVK_SCHEMA_OUT_DIR?: string;

package/dist/utils/debounceWithArgs.d.mts

@@ -1,2 +1,2 @@
 import { KnownAny } from '../types.mjs';
-export default function debounceWithArgs<T extends (...args: KnownAny[]) => KnownAny>(fn: T, wait: number): (...args: Parameters<T>) => void | Promise<void>;
+export default function debounceWithArgs<Callback extends (...args: KnownAny[]) => KnownAny>(callback: Callback, wait: number): (...args: Parameters<Callback>) => Promise<Awaited<ReturnType<Callback>>>;

package/dist/utils/debounceWithArgs.mjs

@@ -1,11 +1,29 @@
-import debounce from 'lodash/debounce.js';
-export default function debounceWithArgs(fn, wait) {
-    const debouncedFunctions = new Map();
+export default function debounceWithArgs(callback, wait) {
+    // Stores timeouts keyed by the stringified arguments
+    const timeouts = new Map();
     return (...args) => {
+        // Convert arguments to a JSON string (or any other stable key generation)
         const key = JSON.stringify(args);
-        if (!debouncedFunctions.has(key)) {
-            debouncedFunctions.set(key, debounce(fn, wait));
+        // Clear any existing timer for this specific key
+        if (timeouts.has(key)) {
+            clearTimeout(timeouts.get(key));
         }
-        return debouncedFunctions.get(key)(...args);
+        // Return a promise that resolves/rejects after the debounce delay
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(async () => {
+                try {
+                    const result = await callback(...args);
+                    resolve(result);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    // Remove the entry once the callback is invoked
+                    timeouts.delete(key);
+                }
+            }, wait);
+            timeouts.set(key, timeoutId);
+        });
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.36",
+  "version": "0.0.1-draft.38",
   "bin": {
     "vovk": "./dist/index.mjs"
   },