vovk-cli 0.0.1-draft.4 → 0.0.1-draft.40

package/README.md

@@ -1 +1 @@
-Description is coming soon.
+Description is coming soon.

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

@@ -1,5 +1,5 @@
 import type { VovkSchema } from 'vovk';
-import { _VovkControllerSchema, _VovkWorkerSchema } from 'vovk/types';
+import type { _VovkControllerSchema, _VovkWorkerSchema } from 'vovk/types';
 interface HandlersDiff {
     nameOfClass: string;
     added: string[];
@@ -15,7 +15,7 @@ export interface DiffResult {
     workers: WorkersOrControllersDiff;
     controllers: WorkersOrControllersDiff;
 }
-export declare function diffHandlers<T extends _VovkWorkerSchema['_handlers'] | _VovkControllerSchema['_handlers']>(oldHandlers: T, newHandlers: T, nameOfClass: string): HandlersDiff;
+export declare function diffHandlers<T extends _VovkWorkerSchema['handlers'] | _VovkControllerSchema['handlers']>(oldHandlers: T, newHandlers: T, nameOfClass: string): HandlersDiff;
 export declare function diffWorkersOrControllers<T extends VovkSchema['controllers'] | VovkSchema['workers']>(oldItems: T, newItems: T): WorkersOrControllersDiff;
 /**
 example output:

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

@@ -27,7 +27,7 @@ export function diffWorkersOrControllers(oldItems, newItems) {
             added.push(item);
         }
         else {
-            const handlers = diffHandlers(oldItems[item]._handlers, newItem._handlers, item);
+            const handlers = diffHandlers(oldItems[item].handlers, newItem.handlers, item);
             if (handlers.added.length || handlers.removed.length || handlers.changed.length) {
                 handlersDiff.push(handlers);
             }

package/dist/dev/ensureClient.d.mts

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

package/dist/dev/ensureClient.mjs

@@ -0,0 +1,31 @@
+import path from 'node:path';
+import fs from 'node:fs/promises';
+export default async function ensureClient(projectInfo) {
+    const { config, cwd, log } = projectInfo;
+    const now = Date.now();
+    const clientoOutDirAbsolutePath = path.join(cwd, config.clientOutDir);
+    const dts = `// auto-generated
+// 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`;
+    const js = dts;
+    const ts = dts;
+    const localJsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.js');
+    const localDtsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'client.d.ts');
+    const localTsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'index.ts');
+    const existingJs = await fs.readFile(localJsAbsolutePath, 'utf-8').catch(() => null);
+    const existingDts = await fs.readFile(localDtsAbsolutePath, 'utf-8').catch(() => null);
+    const existingTs = await fs.readFile(localTsAbsolutePath, 'utf-8').catch(() => null);
+    if (existingJs && existingDts && existingTs) {
+        return { written: false, path: clientoOutDirAbsolutePath };
+    }
+    await fs.mkdir(clientoOutDirAbsolutePath, { recursive: true });
+    if (!existingJs)
+        await fs.writeFile(localJsAbsolutePath, js);
+    if (!existingDts)
+        await fs.writeFile(localDtsAbsolutePath, dts);
+    if (!existingTs)
+        await fs.writeFile(localTsAbsolutePath, ts);
+    log.info(`Empty client files are generated in ${Date.now() - now}ms`);
+    return { written: true, path: clientoOutDirAbsolutePath };
+}

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

@@ -1,5 +1,5 @@
-import fs from 'fs/promises';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import debounce from 'lodash/debounce.js';
 import writeOneSchemaFile, { ROOT_SEGMENT_SCHEMA_NAME } from './writeOneSchemaFile.mjs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
@@ -7,17 +7,29 @@ export default async function ensureSchemaFiles(projectInfo, schemaOutAbsolutePa
     const now = Date.now();
     let hasChanged = false;
     // Create index.js file
-    const indexContent = segmentNames
+    const indexContent = `// auto-generated
+${segmentNames
         .map((segmentName) => {
         return `module.exports['${segmentName}'] = require('./${segmentName || ROOT_SEGMENT_SCHEMA_NAME}.json');`;
     })
-        .join('\n');
-    const dTsContent = `import type { VovkSchema } from 'vovk';
-declare const segmentSchema: Record<string, VovkSchema>;
+        .join('\n')}`;
+    const dTsContent = `// auto-generated
+import type { VovkSchema } from 'vovk';
+declare const segmentSchema: {
+${segmentNames.map((segmentName) => `  '${segmentName}': VovkSchema;`).join('\n')}
+};
 export default segmentSchema;`;
+    const jsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.js');
+    const dTsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.d.ts');
+    const existingJs = await fs.readFile(jsAbsolutePath, 'utf-8').catch(() => null);
+    const existingDTs = await fs.readFile(dTsAbsolutePath, 'utf-8').catch(() => null);
     await fs.mkdir(schemaOutAbsolutePath, { recursive: true });
-    await fs.writeFile(path.join(schemaOutAbsolutePath, 'index.js'), indexContent);
-    await fs.writeFile(path.join(schemaOutAbsolutePath, 'index.d.ts'), dTsContent);
+    if (existingJs !== indexContent) {
+        await fs.writeFile(jsAbsolutePath, indexContent);
+    }
+    if (existingDTs !== dTsContent) {
+        await fs.writeFile(dTsAbsolutePath, dTsContent);
+    }
     // Create JSON files (if not exist) with name [segmentName].json (where segmentName can include /, which means the folder structure can be nested)
     await Promise.all(segmentNames.map(async (segmentName) => {
         const { isCreated } = await writeOneSchemaFile({

package/dist/dev/index.d.mts

@@ -0,0 +1,4 @@
+export declare class VovkDev {
+    #private;
+    start(): Promise<void>;
+}

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

@@ -1,33 +1,34 @@
+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 { debouncedEnsureSchemaFiles } from './ensureSchemaFiles.mjs';
 import writeOneSchemaFile from './writeOneSchemaFile.mjs';
 import logDiffResult from './logDiffResult.mjs';
+import ensureClient from './ensureClient.mjs';
+import getProjectInfo from '../getProjectInfo/index.mjs';
 import generateClient from '../generateClient.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 = () => {
+    #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,
@@ -51,7 +52,6 @@ export class VovkCLIWatcher {
                 void this.#requestSchema(getSegmentName(filePath));
             }
         })
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
             .on('addDir', async (dirPath) => {
             log.debug(`Directory ${dirPath} has been added to segments folder`);
             this.#segments = await locateSegments(apiDirAbsolutePath);
@@ -59,7 +59,6 @@ export class VovkCLIWatcher {
                 void this.#requestSchema(segmentName);
             }
         })
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
             .on('unlinkDir', async (dirPath) => {
             log.debug(`Directory ${dirPath} has been removed from segments folder`);
             this.#segments = await locateSegments(apiDirAbsolutePath);
@@ -78,16 +77,17 @@ export class VovkCLIWatcher {
             }
         })
             .on('ready', () => {
+            callback();
             log.debug('Segments watcher is ready');
         })
             .on('error', (error) => {
-            log.error(`Error watching segments folder: ${error.message}`);
+            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, {
@@ -116,30 +116,37 @@ export class VovkCLIWatcher {
             }
         })
             .on('ready', () => {
+            callback();
             log.debug('Modules watcher is ready');
         })
             .on('error', (error) => {
-            log.error(`Error watching modules folder: ${error.message}`);
+            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');
+            }
+            isInitial = false;
         }, 1000);
-        let ready = false;
         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,
@@ -149,24 +156,23 @@ export class VovkCLIWatcher {
             .on('change', () => void handle())
             .on('unlink', () => void handle())
             .on('ready', () => {
-            if (ready)
+            if (isReady)
                 return;
             // for some reason this watcher triggers ready event twice
             log.debug('Config files watcher is ready');
-            ready = true;
+            isReady = true;
         })
-            .on('error', (error) => {
-            log.error(`Error watching config files: ${error.message}`);
-        });
+            .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;
@@ -183,8 +189,8 @@ export class VovkCLIWatcher {
                 const schema = this.#schemas[s.segmentName];
                 if (!schema)
                     return false;
-                const controllersByOriginalName = keyBy(schema.controllers, '_originalControllerName');
-                const workersByOriginalName = keyBy(schema.workers, '_originalWorkerName');
+                const controllersByOriginalName = keyBy(schema.controllers, 'originalControllerName');
+                const workersByOriginalName = keyBy(schema.workers, 'originalWorkerName');
                 return namesOfClasses.some((name) => schema.controllers[name] ||
                     schema.workers[name] ||
                     controllersByOriginalName[name] ||
@@ -196,6 +202,9 @@ export class VovkCLIWatcher {
                     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`);
@@ -206,23 +215,29 @@ export class VovkCLIWatcher {
         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 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)}: ${error.message}`);
+            return { isError: true };
         }
-        await this.#handleSchema(schema);
+        return { isError: false };
     }, 500);
     async #handleSchema(schema) {
         const { log, config, cwd } = this.#projectInfo;
@@ -259,9 +274,11 @@ export class VovkCLIWatcher {
             await generateClient(this.#projectInfo, this.#segments, this.#schemas);
         }
     }
-    async start({ clientOutDir } = {}) {
-        this.#projectInfo = await getProjectInfo({ clientOutDir });
+    async start() {
+        const now = Date.now();
+        this.#projectInfo = await getProjectInfo();
         const { log, config, cwd, apiDir } = this.#projectInfo;
+        log.info('Starting...');
         if (config.devHttps) {
             const agent = new Agent({
                 connect: {
@@ -280,16 +297,36 @@ export class VovkCLIWatcher {
         const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
         this.#segments = await locateSegments(apiDirAbsolutePath);
         await debouncedEnsureSchemaFiles(this.#projectInfo, schemaOutAbsolutePath, this.#segments.map((s) => s.segmentName));
-        // Request schema every segment in 3 seconds in order to update schema and start watching
+        // 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();
-        }, 3000);
+        }, 5000);
+        this.#watch(() => {
+            log.info(`Ready in ${Date.now() - now}ms`);
+        });
     }
 }
 const env = process.env;
 if (env.__VOVK_START_WATCHER_IN_STANDALONE_MODE__ === 'true') {
-    void new VovkCLIWatcher().start();
+    void new VovkDev().start();
 }

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/{watcher → dev}/logDiffResult.mjs

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 export default function logDiffResult(segmentName, diffResult, projectInfo) {
@@ -37,48 +38,51 @@ export default function logDiffResult(segmentName, diffResult, projectInfo) {
         });
     });
     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 'worker':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'controller':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'workerHandler':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for worker method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;
             case 'controllerHandler':
                 switch (diffNormalizedItem.type) {
                     case 'added':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been added at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${addedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'removed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been removed from ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${removedText} from ${formatLoggedSegmentName(segmentName)}`);
                         break;
                     case 'changed':
-                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been changed at ${formatLoggedSegmentName(segmentName)}`);
+                        projectInfo.log.info(`Schema for controller method ${chalkHighlightThing(diffNormalizedItem.name)} has been ${changedText} at ${formatLoggedSegmentName(segmentName)}`);
                         break;
                 }
                 break;

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,10 +1,11 @@
-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';
 export default async function writeOneSchemaFile({ schemaOutAbsolutePath, schema, skipIfExists = false, }) {
     const segmentPath = path.join(schemaOutAbsolutePath, `${schema.segmentName || ROOT_SEGMENT_SCHEMA_NAME}.json`);
-    if (skipIfExists) {
+    if (skipIfExists && (await getFileSystemEntryType(segmentPath))) {
         try {
             await fs.stat(segmentPath);
             return { isCreated: false, diffResult: null };

package/dist/generateClient.d.mts

@@ -1,6 +1,6 @@
+import type { VovkSchema } from 'vovk';
 import type { ProjectInfo } from './getProjectInfo/index.mjs';
 import type { Segment } from './locateSegments.mjs';
-import type { VovkSchema } from 'vovk';
 export default function generateClient(projectInfo: ProjectInfo, segments: Segment[], segmentsSchema: Record<string, VovkSchema>): Promise<{
     written: boolean;
     path: string;

package/dist/generateClient.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 formatLoggedSegmentName from './utils/formatLoggedSegmentName.mjs';
 import prettify from './utils/prettify.mjs';
 export default async function generateClient(projectInfo, segments, segmentsSchema) {
@@ -48,11 +48,11 @@ type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
     ts += `
 ${validateOnClientImportPath ? `import validateOnClient from '${validateOnClientImportPath}';\n` : '\nconst validateOnClient = undefined;'}
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
-const prefix = '${apiEntryPoint}';
+const apiRoot = '${apiEntryPoint}';
 `;
     js += `
 const { default: validateOnClient = null } = ${validateOnClientImportPath ? `require('${validateOnClientImportPath}')` : '{}'};
-const prefix = '${apiEntryPoint}';
+const apiRoot = '${apiEntryPoint}';
 `;
     for (let i = 0; i < segments.length; i++) {
         const { segmentName } = segments[i];
@@ -64,8 +64,8 @@ const prefix = '${apiEntryPoint}';
             continue;
         for (const key of Object.keys(schema.controllers)) {
             dts += `export const ${key}: ReturnType<typeof clientizeController<Controllers${i}["${key}"], Options>>;\n`;
-            js += `exports.${key} = clientizeController(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
-            ts += `export const ${key} = clientizeController<Controllers${i}["${key}"], Options>(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
+            js += `exports.${key} = clientizeController(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { apiRoot } });\n`;
+            ts += `export const ${key} = clientizeController<Controllers${i}["${key}"], Options>(schema['${segmentName}'].controllers.${key}, '${segmentName}', { fetcher, validateOnClient, defaultOptions: { apiRoot } });\n`;
         }
         for (const key of Object.keys(schema.workers)) {
             dts += `export const ${key}: ReturnType<typeof promisifyWorker<Workers${i}["${key}"]>>;\n`;

package/dist/getProjectInfo/getConfig.mjs

@@ -15,7 +15,7 @@ export default async function getConfig({ clientOutDir, cwd }) {
         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,
         templates: {

package/dist/getProjectInfo/getConfigAbsolutePaths.mjs

@@ -1,5 +1,5 @@
-import fs from 'fs/promises';
-import path from 'path';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 export default async function getConfigAbsolutePaths({ cwd, relativePath, }) {
     const rootDir = path.resolve(cwd, relativePath || '');
     const baseName = 'vovk.config';

package/dist/getProjectInfo/getRelativeSrcRoot.mjs

@@ -1,11 +1,11 @@
-import path from 'path';
-import directoryExists from './directoryExists.mjs';
+import path from 'node:path';
+import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 export default async function getRelativeSrcRoot({ cwd }) {
     // Next.js Docs: src/app or src/pages will be ignored if app or pages are present in the root directory.
-    if (await directoryExists(path.join(cwd, 'app'))) {
+    if ((await getFileSystemEntryType(path.join(cwd, 'app'))) === FileSystemEntryType.DIRECTORY) {
         return '.';
     }
-    else if (await directoryExists(path.join(cwd, 'src/app'))) {
+    else if ((await getFileSystemEntryType(path.join(cwd, 'src/app'))) === FileSystemEntryType.DIRECTORY) {
         return './src';
     }
     throw new Error(`${cwd} Could not find app router directory. Check Next.js docs for more info.`);

package/dist/getProjectInfo/getUserConfig.mjs

@@ -1,3 +1,4 @@
+import { pathToFileURL } from 'node:url';
 import getConfigAbsolutePaths from './getConfigAbsolutePaths.mjs';
 import importUncachedModule from './importUncachedModule.mjs';
 async function getUserConfig({ cwd, }) {
@@ -11,10 +12,11 @@ async function getUserConfig({ cwd, }) {
     try {
         userConfig = await importUncachedModule(configPath);
     }
-    catch (e) {
+    catch {
         try {
             const cacheBuster = Date.now();
-            ({ default: userConfig } = (await import(`${configPath}?cache=${cacheBuster}`)));
+            const configPathUrl = pathToFileURL(configPath).href;
+            ({ default: userConfig } = (await import(`${configPathUrl}?cache=${cacheBuster}`)));
         }
         catch (e) {
             return { userConfig: null, configAbsolutePaths, error: e };

package/dist/getProjectInfo/importUncachedModule.mjs

@@ -3,7 +3,6 @@ import { Worker } from 'node:worker_threads';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import './importUncachedModuleWorker.mjs'; // required for TS compilation
-// TODO comments
 function importUncachedModule(modulePath) {
     return new Promise((resolve, reject) => {
         const __filename = fileURLToPath(import.meta.url);

package/dist/getProjectInfo/importUncachedModuleWorker.mjs

@@ -1,7 +1,6 @@
 import { parentPort, workerData as wData } from 'node:worker_threads';
 import { pathToFileURL } from 'node:url';
 void (async () => {
-    // TODO Comments
     if (!parentPort)
         return;
     const workerData = wData;

package/dist/getProjectInfo/index.mjs

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import getConfig from './getConfig.mjs';
 import getLogger from '../utils/getLogger.mjs';
 export default async function getProjectInfo({ port: givenPort, clientOutDir, cwd = process.cwd(), } = {}) {
@@ -8,7 +8,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, cw
     const { config, srcRoot, configAbsolutePaths, userConfig, error } = await getConfig({ clientOutDir, cwd });
     const apiEntryPoint = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
-    const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir);
+    const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir).replace(/\\/g, '/'); // windows fix
     const fetcherClientImportPath = config.fetcher.startsWith('.')
         ? path.relative(config.clientOutDir, config.fetcher)
         : config.fetcher;