vovk 0.2.3-beta.28 → 0.2.3-beta.29

package/cli/generateClient.js

@@ -1,6 +1,16 @@
 const fs = require('fs/promises');
 const path = require('path');
 const getVovkrc = require('./getVovkrc');
+
+function canRequire(moduleName) {
+  try {
+    require.resolve(moduleName);
+    return true; // The module exists and can be required
+  } catch (e) {
+    return false; // The module does not exist
+  }
+}
+
 /**
  * Generates client code with string concatenation so it should be much faster than using AST
  * TODO: Check modules for existence before compiling, use vovk-zod by default
@@ -8,12 +18,36 @@ const getVovkrc = require('./getVovkrc');
  */
 async function generateClient(rcPath) {
   const vovkrc = getVovkrc(rcPath);
-
+  const jsonPath = '../../.vovk.json';
   const fetcherPath = vovkrc.fetcher.startsWith('.') ? path.join(process.cwd(), vovkrc.fetcher) : vovkrc.fetcher;
   const streamFetcherPath = vovkrc.streamFetcher.startsWith('.')
     ? path.join(process.cwd(), vovkrc.streamFetcher)
     : vovkrc.streamFetcher;
 
+  if (typeof vovkrc.validateOnClient === 'undefined') {
+    vovkrc.validateOnClient = canRequire('vovk-zod/validateOnClient') ? 'vovk-zod/validateOnClient' : null;
+  } else if (!canRequire(vovkrc.validateOnClient)) {
+    throw new Error(
+      `Unble to generate Vovk Client: cannot find "validateOnClient" module '${vovkrc.validateOnClient}'. Check your .vovkrc.js file`
+    );
+  }
+
+  if (!canRequire(fetcherPath)) {
+    throw new Error(
+      `Unble to generate Vovk Client: cannot find "fetcher" module '${fetcherPath}'. Check your .vovkrc.js file`
+    );
+  }
+
+  if (!canRequire(streamFetcherPath)) {
+    throw new Error(
+      `Unble to generate Vovk Client: cannot find "streamFetcher" module '${streamFetcherPath}'. Check your .vovkrc.js file`
+    );
+  }
+
+  if (!canRequire(jsonPath)) {
+    throw new Error(`Unble to generate Vovk Client: cannot find ".vovk.json" file '${jsonPath}'.`);
+  }
+
   const controllersPath = path.join('../..', vovkrc.route).replace(/\.ts$/, '');
   let ts = `import type { Controllers, Workers } from "${controllersPath}";
 import type { clientizeController } from 'vovk/client';
@@ -25,7 +59,7 @@ type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 `;
   let js = `const { clientizeController } = require('vovk/client');
 const { promisifyWorker } = require('vovk/worker');
-const metadata = require('../../.vovk.json');
+const metadata = require('${jsonPath}');
 const { default: fetcher } = require('${fetcherPath}');
 const { default: streamFetcher } = require('${streamFetcherPath}');
 const prefix = '${vovkrc.prefix ?? '/api'}';

package/cli/getVovkrc.js

@@ -17,7 +17,7 @@ function getVovkrc(rcPath) {
   if (fs.existsSync(rcPath)) {
     Object.assign(vovkRc, require(rcPath));
   } else {
-    console.info(` 🐺 No .vovkrc.js file found in ${process.cwd()}.`);
+    console.info(` 🐺 No .vovkrc.js file found in ${process.cwd()}`);
   }
 
   vovkRcRef = vovkRc;

package/cli/index.js

@@ -46,12 +46,6 @@ const builder = {
     default: process.cwd(),
     describe: 'Path to Next.js project',
   },
-
-  output: {
-    type: 'string',
-    default: path.join(__dirname, '../.vovk/index.d.ts'),
-    describe: 'Path to the wildcard route file',
-  },
 };
 
 const options = {
@@ -59,7 +53,7 @@ const options = {
   raw: true,
   killOthers: ['failure', 'success'],
 };
-/** @type {{ rc: string, project: string, output: string }} */
+/** @type {{ rc: string, project: string }} */
 const argv = yargs(hideBin(process.argv))
   .command('dev', 'Run development server', builder)
   .command('build', 'Build the app', builder)
@@ -75,7 +69,7 @@ if (argv._.includes('dev')) {
       const { result } = concurrently(
         [
           {
-            command: `VOVK_PORT=${PORT} node ${__dirname}/server.js --rc ${argv.rc} --output ${argv.output}`,
+            command: `VOVK_PORT=${PORT} node ${__dirname}/server.js --rc ${argv.rc}`,
             name: 'Vovk',
           },
           { command: `cd ${argv.project} && VOVK_PORT=${PORT} npx next dev ${nextArgs}`, name: 'Next' },
@@ -84,11 +78,11 @@ if (argv._.includes('dev')) {
       );
 
       void result.then(() => {
-        console.info(' 🐺 All processes have completed.');
+        console.info(' 🐺 All processes have completed');
       });
     })
     .catch(() => {
-      console.error(' 🐺 Failed to find available port.');
+      console.error(' 🐺 Failed to find available port');
     });
 }
 
@@ -98,7 +92,7 @@ if (argv._.includes('build')) {
       const { result } = concurrently(
         [
           {
-            command: `VOVK_PORT=${PORT} node ${__dirname}/server.js --once --rc ${argv.rc} --output ${argv.output}`,
+            command: `VOVK_PORT=${PORT} node ${__dirname}/server.js --once --rc ${argv.rc}`,
             name: 'Vovk',
           },
           { command: `cd ${argv.project} && VOVK_PORT=${PORT} npx next build ${nextArgs}`, name: 'Next' },
@@ -109,12 +103,12 @@ if (argv._.includes('build')) {
       void result.catch((e) => console.error(e));
     })
     .catch(() => {
-      console.error(' 🐺 Failed to find available port.');
+      console.error(' 🐺 Failed to find available port');
     });
 }
 
 if (argv._.includes('generate')) {
-  void generateClient(argv.rc, argv.output).then(() => {
-    console.info(' 🐺 Client generated.');
+  void generateClient(argv.rc).then(() => {
+    console.info(' 🐺 Client generated');
   });
 }

package/cli/server.js

@@ -56,7 +56,7 @@ const server = http.createServer((req, res) => {
         const metadata = JSON.parse(body); // Parse the JSON data
         const filePath = path.join(__dirname, '../../../.vovk.json');
         const metadataWritten = await writeMetadata(filePath, metadata);
-        const codeWritten = await generateClient(argv.rc, argv.output);
+        const codeWritten = await generateClient(argv.rc);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('JSON data received and file created');
         if (metadataWritten || codeWritten) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "0.2.3-beta.28",
+  "version": "0.2.3-beta.29",
   "description": "Structural add-on for Next.js",
   "bin": "./cli/index.js",
   "scripts": {