vovk-cli 0.0.1-beta.6 → 0.0.1-beta.8

package/dist/getProjectInfo/getConfig.mjs

@@ -1,17 +1,14 @@
 import readConfig from './readConfig.mjs';
-import getCwdPath from './getCwdPath.mjs';
-import getSrcRoot from './getSrcRoot.mjs';
-import path from 'path';
+import getRelativeSrcRoot from './getRelativeSrcRoot.mjs';
 export default async function getConfig({ clientOutDir }) {
     const env = process.env;
     const userConfig = await readConfig();
-    const srcRoot = await getSrcRoot();
-    const cwd = process.cwd();
+    const srcRoot = await getRelativeSrcRoot();
     const config = {
-        modulesDir: path.join(cwd, env.VOVK_MODULES_DIR ?? userConfig.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/')),
-        validateOnClient: getCwdPath(env.VOVK_VALIDATE_ON_CLIENT ?? userConfig.validateOnClient ?? null),
-        validationLibrary: getCwdPath(env.VOVK_VALIDATION_LIBRARY ?? userConfig.validationLibrary ?? null),
-        fetcher: getCwdPath(env.VOVK_FETCHER ?? userConfig.fetcher ?? 'vovk/client/defaultFetcher'),
+        modulesDir: env.VOVK_MODULES_DIR ?? userConfig.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
+        validateOnClient: env.VOVK_VALIDATE_ON_CLIENT ?? userConfig.validateOnClient ?? null,
+        validationLibrary: env.VOVK_VALIDATION_LIBRARY ?? userConfig.validationLibrary ?? null,
+        fetcher: env.VOVK_FETCHER ?? userConfig.fetcher ?? 'vovk/client/defaultFetcher',
         metadataOutDir: env.VOVK_METADATA_OUT_DIR ?? userConfig.metadataOutDir ?? './.vovk-schema',
         clientOutDir: clientOutDir ?? env.VOVK_CLIENT_OUT_DIR ?? userConfig.clientOutDir ?? './node_modules/.vovk',
         origin: (env.VOVK_ORIGIN ?? userConfig.origin ?? '').replace(/\/$/, ''), // Remove trailing slash

package/dist/getProjectInfo/getRelativeSrcRoot.d.mts

@@ -0,0 +1 @@
+export default function getRelativeSrcRoot(): Promise<"." | "./src">;

package/dist/getProjectInfo/{getSrcRoot.mjs → getRelativeSrcRoot.mjs}

@@ -1,13 +1,13 @@
 import path from 'path';
 import directoryExists from './directoryExists.mjs';
-export default async function getSrcRoot() {
+export default async function getRelativeSrcRoot() {
     const cwd = process.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'))) {
-        return cwd;
+        return '.';
     }
     else if (await directoryExists(path.join(cwd, 'src/app'))) {
-        return path.join(cwd, 'src');
+        return './src';
     }
     throw new Error(`Could not find app router directory. Check Next.js docs for more info.`);
 }

package/dist/getProjectInfo/index.d.mts

@@ -10,9 +10,7 @@ export default function getProjectInfo({ port: givenPort, clientOutDir, }?: {
     apiEntryPoint: string;
     apiDir: string;
     srcRoot: string;
-    metadataOutFullPath: string;
     metadataOutImportPath: string;
-    clientOutFullPath: string;
     fetcherClientImportPath: string;
     config: Required<import("../types.mjs").VovkConfig>;
     log: {

package/dist/getProjectInfo/index.mjs

@@ -12,12 +12,10 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, }
     const vovkPort = env.VOVK_PORT || (parseInt(port) + 6969).toString();
     const apiEntryPoint = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
-    const metadataOutFullPath = path.join(cwd, config.metadataOutDir);
-    const metadataOutImportPath = path.relative(config.clientOutDir, metadataOutFullPath);
+    const metadataOutImportPath = path.relative(config.clientOutDir, config.metadataOutDir);
     const fetcherClientImportPath = config.fetcher.startsWith('.')
         ? path.relative(config.clientOutDir, config.fetcher)
         : config.fetcher;
-    const clientOutFullPath = path.join(cwd, config.clientOutDir);
     const log = {
         info: (msg) => loglevel.info(chalk.blueBright(`🐺 ${msg}`)),
         warn: (msg) => loglevel.warn(chalk.yellowBright(`🐺 ${msg}`)),
@@ -33,9 +31,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, }
         apiEntryPoint,
         apiDir,
         srcRoot,
-        metadataOutFullPath,
         metadataOutImportPath,
-        clientOutFullPath,
         fetcherClientImportPath,
         config,
         log,

package/dist/getProjectInfo/readConfig.mjs

@@ -23,10 +23,8 @@ async function readConfig() {
         return config;
     }
     try {
-        if (configPath.endsWith('.cjs') || configPath.endsWith('.js')) {
-            const cacheBuster = Date.now();
-            ({ default: config } = (await import(`${configPath}?cache=${cacheBuster}`)));
-        }
+        const cacheBuster = Date.now();
+        ({ default: config } = (await import(`${configPath}?cache=${cacheBuster}`)));
     }
     catch (e) {
         // eslint-disable-next-line no-console

package/dist/index.mjs

@@ -65,8 +65,10 @@ program
     .option('--client-out <path>', 'Path to output directory')
     .action(async (options) => {
     const projectInfo = await getProjectInfo({ clientOutDir: options.clientOut });
-    const segments = await locateSegments(projectInfo.apiDir);
-    const metadata = (await import(path.join(projectInfo.metadataOutFullPath, 'index.js')));
+    const { cwd, config, apiDir } = projectInfo;
+    const segments = await locateSegments(apiDir);
+    const metadataOutFullPath = path.join(cwd, config.metadataOutDir);
+    const metadata = (await import(path.join(metadataOutFullPath, 'index.js')));
     await generateClient(projectInfo, segments, metadata.default);
 });
 program

package/dist/server/generateClient.mjs

@@ -2,8 +2,8 @@ import path from 'path';
 import fs from 'fs/promises';
 export default async function generateClient(projectInfo, segments, segmentsMetadata) {
     const now = Date.now();
-    const outDir = projectInfo.clientOutFullPath;
-    const validatePath = projectInfo.config.validateOnClient?.startsWith('.')
+    const clientoOutDirFullPath = path.join(projectInfo.cwd, projectInfo.config.clientOutDir);
+    const validateFullPath = projectInfo.config.validateOnClient?.startsWith('.')
         ? path.join(projectInfo.cwd, projectInfo.config.validateOnClient)
         : projectInfo.config.validateOnClient;
     let dts = `// auto-generated
@@ -46,12 +46,12 @@ import metadata from '${projectInfo.metadataOutImportPath}';
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
   `;
     ts += `
-${validatePath ? `import validateOnClient from '${validatePath}';\n` : '\nconst validateOnClient = undefined;'}
+${validateFullPath ? `import validateOnClient from '${validateFullPath}';\n` : '\nconst validateOnClient = undefined;'}
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 const prefix = '${projectInfo.apiEntryPoint}';
   `;
     js += `
-const { default: validateOnClient = null } = ${validatePath ? `require('${validatePath}')` : '{}'};
+const { default: validateOnClient = null } = ${validateFullPath ? `require('${validateFullPath}')` : '{}'};
 const prefix = '${projectInfo.apiEntryPoint}';
 `;
     for (let i = 0; i < segments.length; i++) {
@@ -73,20 +73,20 @@ const prefix = '${projectInfo.apiEntryPoint}';
             ts += `export const ${key} = promisifyWorker<Workers${i}["${key}"]>(null, metadata['${segmentName}'].workers.${key});\n`;
         }
     }
-    const localJsPath = path.join(outDir, 'client.js');
-    const localDtsPath = path.join(outDir, 'client.d.ts');
-    const localTsPath = path.join(outDir, 'index.ts');
+    const localJsPath = path.join(clientoOutDirFullPath, 'client.js');
+    const localDtsPath = path.join(clientoOutDirFullPath, 'client.d.ts');
+    const localTsPath = path.join(clientoOutDirFullPath, 'index.ts');
     const existingJs = await fs.readFile(localJsPath, 'utf-8').catch(() => '');
     const existingDts = await fs.readFile(localDtsPath, 'utf-8').catch(() => '');
     const existingTs = await fs.readFile(localTsPath, 'utf-8').catch(() => '');
     if (existingJs === js && existingDts === dts && existingTs === ts) {
         projectInfo.log.info(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms).`);
-        return { written: false, path: outDir };
+        return { written: false, path: clientoOutDirFullPath };
     }
-    await fs.mkdir(outDir, { recursive: true });
+    await fs.mkdir(clientoOutDirFullPath, { recursive: true });
     await fs.writeFile(localJsPath, js);
     await fs.writeFile(localDtsPath, dts);
     await fs.writeFile(localTsPath, ts);
     projectInfo.log.info(`Client generated in ${Date.now() - now}ms`);
-    return { written: true, path: outDir };
+    return { written: true, path: clientoOutDirFullPath };
 }

package/dist/server/index.mjs

@@ -21,11 +21,13 @@ export class VovkCLIServer {
     #segmentWatcher = null;
     #watchSegments = () => {
         const segmentReg = /\/?\[\[\.\.\.[a-zA-Z-_]+\]\]\/route.ts$/;
-        const { apiDir, log, metadataOutFullPath } = this.#projectInfo;
-        const getSegmentName = (filePath) => path.relative(apiDir, filePath).replace(segmentReg, '');
-        log.debug(`Watching segments in ${apiDir}`);
+        const { cwd, log, config, apiDir } = this.#projectInfo;
+        const metadataOutFullPath = path.join(cwd, config.metadataOutDir);
+        const apiDirFullPath = path.join(cwd, apiDir);
+        const getSegmentName = (filePath) => path.relative(apiDirFullPath, filePath).replace(segmentReg, '');
+        log.debug(`Watching segments in ${apiDirFullPath}`);
         this.#segmentWatcher = chokidar
-            .watch(apiDir, {
+            .watch(apiDirFullPath, {
             persistent: true,
             ignoreInitial: true,
         })
@@ -51,7 +53,7 @@ export class VovkCLIServer {
             // 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(this.#projectInfo.apiDir);
+            this.#segments = await locateSegments(apiDirFullPath);
             for (const { segmentName } of this.#segments) {
                 void this.#ping(segmentName);
             }
@@ -59,7 +61,7 @@ export class VovkCLIServer {
             // 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(this.#projectInfo.apiDir);
+            this.#segments = await locateSegments(apiDirFullPath);
             for (const { segmentName } of this.#segments) {
                 void this.#ping(segmentName);
             }
@@ -83,10 +85,11 @@ export class VovkCLIServer {
         });
     };
     #watchModules = () => {
-        const { config, log } = this.#projectInfo;
-        log.debug(`Watching modules in ${config.modulesDir}`);
+        const { config, cwd, log } = this.#projectInfo;
+        const modulesDirFullPath = path.join(cwd, config.modulesDir);
+        log.debug(`Watching modules in ${modulesDirFullPath}`);
         this.#modulesWatcher = chokidar
-            .watch(config.modulesDir, {
+            .watch(modulesDirFullPath, {
             persistent: true,
             ignoreInitial: true,
         })
@@ -119,7 +122,7 @@ export class VovkCLIServer {
         });
     };
     #watchConfig = () => {
-        const { log } = this.#projectInfo;
+        const { log, cwd } = this.#projectInfo;
         log.debug(`Watching config files`);
         let isInitial = true;
         const handle = debounce(async () => {
@@ -136,7 +139,7 @@ export class VovkCLIServer {
         chokidar
             .watch('vovk.config.{js,mjs,cjs}', {
             persistent: true,
-            cwd: process.cwd(),
+            cwd,
             ignoreInitial: false,
             depth: 0,
         })
@@ -153,8 +156,8 @@ export class VovkCLIServer {
     #watch() {
         if (this.#isWatching)
             throw new Error('Already watching');
-        const { apiDir, log, config } = this.#projectInfo;
-        log.info(`Watching segments in ${apiDir} and modules in ${config.modulesDir}. Detected initial segments: ${JSON.stringify(this.#segments.map((s) => s.segmentName))}.`);
+        const { log } = this.#projectInfo;
+        log.debug(`Starting segments and modules watcher. Detected initial segments: ${JSON.stringify(this.#segments.map((s) => s.segmentName))}.`);
         this.#watchSegments();
         this.#watchModules();
         this.#watchConfig();
@@ -196,11 +199,12 @@ export class VovkCLIServer {
         });
     }, 500);
     #createMetadataServer() {
-        const { metadataOutFullPath, log } = this.#projectInfo;
+        const { log, config, cwd } = this.#projectInfo;
+        const metadataOutFullPath = path.join(cwd, config.metadataOutDir);
         return createMetadataServer(async ({ metadata }) => {
             const segment = this.#segments.find((s) => s.segmentName === metadata.segmentName);
             if (!segment) {
-                log.debug(`Segment "${metadata.segmentName}" not found`);
+                log.warn(`Segment "${metadata.segmentName}" not found`);
                 return;
             }
             this.#metadata[metadata.segmentName] = metadata;
@@ -230,8 +234,10 @@ export class VovkCLIServer {
     }
     async startServer({ clientOutDir } = {}) {
         this.#projectInfo = await getProjectInfo({ clientOutDir });
-        this.#segments = await locateSegments(this.#projectInfo.apiDir);
-        const { vovkPort, log, metadataOutFullPath } = this.#projectInfo;
+        const { vovkPort, log, config, cwd, apiDir } = this.#projectInfo;
+        const apiDirFullPath = path.join(cwd, apiDir);
+        const metadataOutFullPath = path.join(cwd, config.metadataOutDir);
+        this.#segments = await locateSegments(apiDirFullPath);
         const server = this.#createMetadataServer();
         if (!vovkPort) {
             log.error('No port provided for Vovk Server. Exiting...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.6",
+  "version": "0.0.1-beta.8",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -30,7 +30,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-beta.10"
+    "vovk": "^3.0.0-beta.18"
   },
   "dependencies": {
     "@inquirer/prompts": "^5.3.8",

package/dist/getProjectInfo/getCwdPath.d.mts

@@ -1 +0,0 @@
-export default function getCwdPath<T extends string | null>(inputPath: T, baseDir?: string): T;

package/dist/getProjectInfo/getCwdPath.mjs

@@ -1,13 +0,0 @@
-import path from 'path';
-// TODO Rename
-export default function getCwdPath(inputPath, baseDir = process.cwd()) {
-    if (inputPath === null) {
-        return null;
-    }
-    // Check if the path is absolute
-    if (path.isAbsolute(inputPath) || inputPath.startsWith('./') || inputPath.startsWith('../')) {
-        return path.resolve(baseDir, inputPath);
-    }
-    // If it's a module or absolute path, keep it as is
-    return inputPath;
-}

package/dist/getProjectInfo/getSrcRoot.d.mts

@@ -1 +0,0 @@
-export default function getSrcRoot(): Promise<string>;