vovk 0.2.3-beta.68 → 0.2.3-beta.69

package/cli/generateClient.js

@@ -1,21 +1,28 @@
 // @ts-check
 const fs = require('fs/promises');
 const path = require('path');
-const canRequire = require('./lib/canRequire');
 const getReturnPath = require('./lib/getReturnPath');
 
+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 fetcher and streamFetcher for existence
  * @type {(rcPath: import('../src').VovkEnv) => Promise<boolean>}
  */
 async function generateClient({ ...env }) {
-  const outDir = path.join(__dirname, '../..', env.VOVK_CLIENT_OUT);
-  const returnDir = getReturnPath(outDir, path.join(__dirname, '../..'));
+  const outDir = env.VOVK_CLIENT_OUT;
+  const returnDir = getReturnPath(outDir, process.cwd());
   const jsonPath = path.join(returnDir, '.vovk.json');
-  const localJsonPath = path.join('..', jsonPath);
+  const localJsonPath = path.join(process.cwd(), '.vovk.json');
   const fetcherPath = env.VOVK_FETCHER.startsWith('.') ? path.join(returnDir, env.VOVK_FETCHER) : env.VOVK_FETCHER;
-
   const streamFetcherPath = env.VOVK_STREAM_FETCHER.startsWith('.')
     ? path.join(returnDir, env.VOVK_STREAM_FETCHER)
     : env.VOVK_STREAM_FETCHER;
@@ -37,7 +44,8 @@ async function generateClient({ ...env }) {
   }
 
   const controllersPath = path.join(returnDir, env.VOVK_ROUTE).replace(/\.ts$/, '');
-  let ts = `/* auto-generated */
+  let ts = `// auto-generated
+/* eslint-disable */
 import type { Controllers, Workers } from "${controllersPath}";
 import type { clientizeController } from 'vovk/client';
 import type { promisifyWorker } from 'vovk/worker';
@@ -46,7 +54,8 @@ import type fetcher from '${fetcherPath}';
 
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 `;
-  let js = `/* auto-generated */
+  let js = `// auto-generated
+/* eslint-disable */
 const { clientizeController } = require('vovk/client');
 const { promisifyWorker } = require('vovk/worker');
 const metadata = require('${jsonPath}');
@@ -77,14 +86,15 @@ const { default: validateOnClient = null } = ${
     if(typeof window !== 'undefined') fetch(prefix + '/__ping', { method: 'POST' });
   `; */
 
-  const jsPath = path.join(__dirname, returnDir, env.VOVK_CLIENT_OUT, 'index.js');
-  const tsPath = path.join(__dirname, returnDir, env.VOVK_CLIENT_OUT, 'index.d.ts');
-  const existingJs = await fs.readFile(jsPath, 'utf-8').catch(() => '');
-  const existingTs = await fs.readFile(tsPath, 'utf-8').catch(() => '');
+  const localJsPath = path.join(outDir, 'index.js');
+  const localTsPath = path.join(outDir, 'index.d.ts');
+  const existingJs = await fs.readFile(localJsPath, 'utf-8').catch(() => '');
+  const existingTs = await fs.readFile(localTsPath, 'utf-8').catch(() => '');
   if (existingJs === js && existingTs === ts) return false;
-  await fs.mkdir(path.join(__dirname, returnDir, env.VOVK_CLIENT_OUT), { recursive: true });
-  await fs.writeFile(tsPath, ts);
-  await fs.writeFile(jsPath, js);
+
+  await fs.mkdir(outDir, { recursive: true });
+  await fs.writeFile(localJsPath, js);
+  await fs.writeFile(localTsPath, ts);
 
   return true;
 }

package/cli/getVars.js

@@ -1,5 +1,7 @@
 // @ts-check
 
+const path = require('path');
+
 let vars;
 /** @type {(rcPath: string, options?: { warn?: boolean; VOVK_CLIENT_OUT?: string; }) => import('../src').VovkEnv} */
 function getVars(rcPath, options = {}) {
@@ -21,7 +23,14 @@ function getVars(rcPath, options = {}) {
   }
 
   vars = {
-    VOVK_CLIENT_OUT: process.env.VOVK_OUT || options.VOVK_CLIENT_OUT || vovkRc.out,
+    VOVK_CLIENT_OUT:
+      process.env.VOVK_OUT ||
+      (options.VOVK_CLIENT_OUT?.startsWith('/')
+        ? options.VOVK_CLIENT_OUT
+        : options.VOVK_CLIENT_OUT
+          ? path.join(process.cwd(), options.VOVK_CLIENT_OUT)
+          : null) ||
+      vovkRc.out,
     VOVK_PORT: process.env.VOVK_PORT || '3420',
     VOVK_ROUTE: process.env.VOVK_ROUTE || vovkRc.route,
     VOVK_FETCHER: process.env.VOVK_FETCHER || vovkRc.fetcher,

package/package.json

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

package/cli/lib/canRequire.js

@@ -1,11 +0,0 @@
-// @ts-check
-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
-  }
-}
-
-module.exports = canRequire;