vovk 0.2.3-beta.32 → 0.2.3-beta.34

package/cli/generateClient.js

@@ -13,41 +13,48 @@ function canRequire(moduleName) {
 
 /**
  * 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
+ * TODO: Check fetcher and streamFetcher for existence
  * @type {(rcPath: string) => Promise<void>}
  */
 async function generateClient(rcPath) {
   const vovkrc = getVovkrc(rcPath);
   const jsonPath = '../../.vovk.json';
-  const fetcherPath = vovkrc.fetcher.startsWith('.')
-    ? path.join(__dirname, '../../..', vovkrc.fetcher)
-    : vovkrc.fetcher;
+  const localJsonPath = path.join('..', jsonPath);
+  const fetcherPath = vovkrc.fetcher.startsWith('.') ? path.join(__dirname, '../..', vovkrc.fetcher) : vovkrc.fetcher;
+  const localFetcherPath = vovkrc.fetcher.startsWith('.') ? path.join('..', fetcherPath) : fetcherPath;
   const streamFetcherPath = vovkrc.streamFetcher.startsWith('.')
-    ? path.join(process.cwd(), vovkrc.streamFetcher)
+    ? path.join(__dirname, '../..', vovkrc.streamFetcher)
     : vovkrc.streamFetcher;
+  const localStreamFetcherPath = vovkrc.streamFetcher.startsWith('.')
+    ? path.join('..', streamFetcherPath)
+    : streamFetcherPath;
+  const validatePath = vovkrc.validateOnClient?.startsWith('.')
+    ? path.join(__dirname, '../..', vovkrc.validateOnClient)
+    : vovkrc.validateOnClient;
+  const localValidatePath = vovkrc.validateOnClient?.startsWith('.') ? path.join('..', validatePath) : validatePath;
 
   if (typeof vovkrc.validateOnClient === 'undefined') {
     vovkrc.validateOnClient = canRequire('vovk-zod/zodValidateOnClient') ? 'vovk-zod/zodValidateOnClient' : null;
-  } else if (vovkrc.validateOnClient && !canRequire(vovkrc.validateOnClient)) {
+  } else if (vovkrc.validateOnClient && !canRequire(localValidatePath)) {
     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(localJsonPath)) {
+    throw new Error(`Unble to generate Vovk Client: cannot find ".vovk.json" file '${jsonPath}'.`);
   }
 
-  if (!canRequire(streamFetcherPath)) {
+  if (!canRequire(localFetcherPath)) {
     throw new Error(
-      `Unble to generate Vovk Client: cannot find "streamFetcher" module '${streamFetcherPath}'. Check your .vovkrc.js file`
+      `Unble to generate Vovk Client: cannot find "fetcher" module '${vovkrc.fetcher}'. Check your .vovkrc.js file`
     );
   }
 
-  if (!canRequire(jsonPath)) {
-    throw new Error(`Unble to generate Vovk Client: cannot find ".vovk.json" file '${jsonPath}'.`);
+  if (!canRequire(localStreamFetcherPath)) {
+    throw new Error(
+      `Unble to generate Vovk Client: cannot find "streamFetcher" module '${vovkrc.streamFetcher}'. Check your .vovkrc.js file`
+    );
   }
 
   const controllersPath = path.join('../..', vovkrc.route).replace(/\.ts$/, '');
@@ -61,7 +68,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('${jsonPath}');
+const metadata = require('${localJsonPath}');
 const { default: fetcher } = require('${fetcherPath}');
 const { default: streamFetcher } = require('${streamFetcherPath}');
 const prefix = '${vovkrc.prefix ?? '/api'}';

package/package.json

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