vovk-cli 0.0.1-beta.24 → 0.0.1-beta.26

package/dist/getProjectInfo/getConfig.d.mts

@@ -4,4 +4,5 @@ export default function getConfig({ clientOutDir }: {
 }): Promise<{
     config: Required<VovkConfig>;
     srcRoot: string;
+    configPaths: string[];
 }>;

package/dist/getProjectInfo/getConfig.mjs

@@ -2,7 +2,7 @@ import readConfig from './readConfig.mjs';
 import getRelativeSrcRoot from './getRelativeSrcRoot.mjs';
 export default async function getConfig({ clientOutDir }) {
     const env = process.env;
-    const userConfig = await readConfig();
+    const { userConfig, configPaths } = await readConfig();
     const srcRoot = await getRelativeSrcRoot();
     const config = {
         modulesDir: env.VOVK_MODULES_DIR ?? userConfig.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
@@ -24,5 +24,5 @@ export default async function getConfig({ clientOutDir }) {
             ...userConfig.templates,
         },
     };
-    return { config, srcRoot };
+    return { config, srcRoot, configPaths };
 }

package/dist/getProjectInfo/getConfigPaths.d.mts

@@ -0,0 +1 @@
+export default function getConfigPaths(relativePath?: string): Promise<string[]>;

package/dist/getProjectInfo/getConfigPaths.mjs

@@ -0,0 +1,22 @@
+import fs from 'fs/promises';
+import path from 'path';
+export default async function getConfigPaths(relativePath = '') {
+    const rootDir = path.resolve(process.cwd(), relativePath || '');
+    const baseName = 'vovk.config';
+    const extensions = ['cjs', 'mjs', 'js'];
+    const dirs = [path.join(rootDir, '.config'), rootDir];
+    const configs = [];
+    for (const ext of extensions) {
+        for (const dir of dirs) {
+            const filePath = path.join(dir, `${baseName}.${ext}`);
+            try {
+                await fs.stat(filePath);
+                configs.push(filePath); // Return the path if the file exists
+            }
+            catch {
+                // Empty
+            }
+        }
+    }
+    return configs;
+}

package/dist/getProjectInfo/index.mjs

@@ -6,7 +6,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, }
     // Make PORT available to the config file at getConfig
     process.env.PORT = port;
     const cwd = process.cwd();
-    const { config, srcRoot } = await getConfig({ clientOutDir });
+    const { config, srcRoot, configPaths } = await getConfig({ clientOutDir });
     const apiEntryPoint = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
     const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir);
@@ -17,6 +17,9 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, }
         ? path.relative(config.clientOutDir, config.validateOnClient)
         : config.validateOnClient;
     const log = getLogger(config.logLevel);
+    if (configPaths.length > 1) {
+        log.warn(`Multiple config files found. Using the first one: ${configPaths[0]}`);
+    }
     return {
         cwd,
         port,

package/dist/getProjectInfo/readConfig.d.mts

@@ -1,3 +1,6 @@
 import type { VovkConfig } from '../types.mjs';
-declare function readConfig(): Promise<VovkConfig>;
+declare function readConfig(): Promise<{
+    userConfig: VovkConfig;
+    configPaths: string[];
+}>;
 export default readConfig;

package/dist/getProjectInfo/readConfig.mjs

@@ -1,18 +1,19 @@
-import getConfigPath from './getConfigPath.mjs';
+import getConfigPath from './getConfigPaths.mjs';
 async function readConfig() {
-    const configPath = await getConfigPath();
-    let config = {};
-    if (!configPath) {
-        return config;
+    const configPaths = await getConfigPath();
+    let userConfig = {};
+    if (!configPaths.length) {
+        return { userConfig, configPaths };
     }
+    const configPath = configPaths[0];
     try {
         const cacheBuster = Date.now();
-        ({ default: config } = (await import(`${configPath}?cache=${cacheBuster}`)));
+        ({ default: userConfig } = (await import(`${configPath}?cache=${cacheBuster}`)));
     }
     catch (e) {
         // eslint-disable-next-line no-console
         console.error('🐺 ❌ Error reading config file:', e.message);
     }
-    return config;
+    return { userConfig, configPaths };
 }
 export default readConfig;

package/dist/init/index.mjs

@@ -61,7 +61,7 @@ import NPMCliPackageJson from '@npmcli/package-json';
 import path from 'path';
 import fs from 'fs/promises';
 import * as jsonc from 'jsonc-parser';
-import getConfigPath from '../getProjectInfo/getConfigPath.mjs';
+import getConfigPath from '../getProjectInfo/getConfigPaths.mjs';
 import chalk from 'chalk';
 import fileExists from '../utils/fileExists.mjs';
 import installDependencies from './installDependencies.mjs';
@@ -166,9 +166,9 @@ class Context {
         if (!(await fileExists(path.join(root, 'tsconfig.json')))) {
             throw new Error(`tsconfig.json not found at ${root}. Run "npx tsc --init" to create a new tsconfig.json file.`);
         }
-        if (configPath) {
+        if (configPath.length) {
             if (!(await confirm({
-                message: `Found existing config file at ${configPath}. Do you want to reinitialize the project?`,
+                message: `Found existing config file at ${configPath[0]}. Do you want to reinitialize the project?`,
             })))
                 return;
         }
@@ -239,6 +239,7 @@ class Context {
             context.actions.push(updateTsconfigAction);
         }
         await installDependencies(root, toBeInstalled, ['concurrently', 'vovk-cli']);
+        // TODO create config file, based on .config folder and "module" in package.json
     }
 }
 export const Init = Context;

package/dist/watcher/index.mjs

@@ -136,7 +136,7 @@ export class VovkCLIWatcher {
             this.#watchSegments();
         }, 1000);
         chokidar
-            .watch('vovk.config.{js,mjs,cjs}', {
+            .watch(['vovk.config.{js,mjs,cjs}', '.config/vovk.config.{js,mjs,cjs}'], {
             persistent: true,
             cwd,
             ignoreInitial: false,
@@ -190,7 +190,7 @@ export class VovkCLIWatcher {
             }
         }
         else {
-            log.debug(`File ${filePath} does not contain any vovk controller or worker`);
+            log.debug(`The file does not contain any controller or worker`);
         }
     };
     #requestSchema = debounceWithArgs(async (segmentName) => {

package/dist/watcher/logDiffResult.mjs

@@ -8,6 +8,17 @@ export default function logDiffResult(segmentName, diffResult, projectInfo) {
     diffResult.workers.removed.forEach((name) => {
         diffNormalized.push({ what: 'worker', type: 'removed', name });
     });
+    diffResult.workers.handlers.forEach((handler) => {
+        handler.added.forEach((name) => {
+            diffNormalized.push({ what: 'workerHandler', type: 'added', name: `${handler.nameOfClass}.${name}` });
+        });
+        handler.removed.forEach((name) => {
+            diffNormalized.push({ what: 'workerHandler', type: 'removed', name: `${handler.nameOfClass}.${name}` });
+        });
+        handler.changed.forEach((name) => {
+            diffNormalized.push({ what: 'workerHandler', type: 'changed', name: `${handler.nameOfClass}.${name}` });
+        });
+    });
     diffResult.controllers.added.forEach((name) => {
         diffNormalized.push({ what: 'controller', type: 'added', name });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.24",
+  "version": "0.0.1-beta.26",
   "bin": {
     "vovk": "./dist/index.mjs"
   },

package/dist/getProjectInfo/getConfigPath.d.mts

@@ -1 +0,0 @@
-export default function getConfigPath(relativePath?: string): Promise<string | null>;

package/dist/getProjectInfo/getConfigPath.mjs

@@ -1,18 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-export default async function getConfigPath(relativePath = '') {
-    const rootDir = path.resolve(process.cwd(), relativePath || '');
-    const baseName = 'vovk.config';
-    const extensions = ['cjs', 'mjs', 'js'];
-    for (const ext of extensions) {
-        const filePath = path.join(rootDir, `${baseName}.${ext}`);
-        try {
-            await fs.stat(filePath);
-            return filePath; // Return the path if the file exists
-        }
-        catch {
-            // Empty
-        }
-    }
-    return null; // Return null if no config file was found
-}