vovk-cli 0.0.1-beta.20 → 0.0.1-beta.21

package/dist/generateClient.mjs

@@ -85,7 +85,7 @@ const prefix = '${apiEntryPoint}';
         ts = await prettify(ts, localTsAbsolutePath);
     }
     if (existingJs === js && existingDts === dts && existingTs === ts) {
-        log.info(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
+        log.debug(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
         return { written: false, path: clientoOutDirAbsolutePath };
     }
     await fs.mkdir(clientoOutDirAbsolutePath, { recursive: true });

package/dist/getProjectInfo/getConfig.d.mts

@@ -2,6 +2,6 @@ import type { VovkConfig } from '../types.mjs';
 export default function getConfig({ clientOutDir }: {
     clientOutDir?: string;
 }): Promise<{
-    config: Required<Omit<VovkConfig, "_devForceAppDir">>;
+    config: Required<VovkConfig>;
     srcRoot: string;
 }>;

package/dist/getProjectInfo/getConfig.mjs

@@ -17,12 +17,12 @@ export default async function getConfig({ clientOutDir }) {
         logLevel: env.VOVK_LOG_LEVEL ?? userConfig.logLevel ?? 'debug', // TODO: change to 'warn' when v3 is ready
         prettifyClient: userConfig.prettifyClient ?? false,
         templates: {
+            // TODO individual templates for each validation library
             service: 'vovk-cli/templates/service.ejs',
             controller: 'vovk-cli/templates/controller.ejs',
             worker: 'vovk-cli/templates/worker.ejs',
             ...userConfig.templates,
         },
     };
-    // forceAppDir is used for testing purposes
     return { config, srcRoot };
 }

package/dist/getProjectInfo/index.d.mts

@@ -11,7 +11,7 @@ export default function getProjectInfo({ port: givenPort, clientOutDir, }?: {
     schemaOutImportPath: string;
     fetcherClientImportPath: string;
     validateOnClientImportPath: string | null;
-    config: Required<Omit<import("../types.mjs").VovkConfig, "_devForceAppDir">>;
+    config: Required<import("../types.mjs").VovkConfig>;
     log: {
         info: (msg: string) => void;
         warn: (msg: string) => void;

package/dist/new/newModule.mjs

@@ -48,7 +48,9 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
     }
     for (const type of what) {
         const templatePath = templates[type];
-        const templateAbsolutePath = path.join(cwd, '../..', templatePath); // TODO WRONG, use import.meta.resolve, also in other modules for fetcher, validateOnClient, etc.
+        const templateAbsolutePath = templatePath.startsWith('/') || templatePath.startsWith('.')
+            ? path.resolve(cwd, templatePath)
+            : path.resolve(cwd, './node_modules', templatePath);
         const templateCode = await fs.readFile(templateAbsolutePath, 'utf-8');
         const { fileName, className, rpcName, code } = await render(templateCode, {
             config,
@@ -56,8 +58,7 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             segmentName,
             moduleName,
         });
-        console.log(config.modulesDir, fileName);
-        const absoluteModulePath = path.join(config.modulesDir, fileName);
+        const absoluteModulePath = path.join(cwd, config.modulesDir, fileName);
         const dirName = path.dirname(absoluteModulePath);
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
@@ -72,7 +73,7 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
         if (type === 'controller' || type === 'worker') {
             const { routeFilePath } = segment;
             const segmentSourceCode = await fs.readFile(routeFilePath, 'utf-8');
-            const importPath = path.relative(dirName, fileName); // TODO WRONG
+            const importPath = path.relative(dirName, absoluteModulePath).replace(/\.(ts|tsx)$/, '');
             const newSegmentCode = addClassToSegmentCode(segmentSourceCode, {
                 className,
                 rpcName,

package/dist/watcher/index.mjs

@@ -194,7 +194,11 @@ export class VovkCLIWatcher {
         log.debug(`Requesting schema for ${formatLoggedSegmentName(segmentName)} at ${endpoint}`);
         const resp = await fetch(endpoint);
         if (resp.status !== 200) {
-            log.warn(`Schema request to ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status}. Expected 200.`);
+            const probableCause = {
+                404: 'The segment is not compiled.',
+                500: 'Syntax error in one of controllers.',
+            }[resp.status];
+            log.warn(`Schema request to ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status} but expected 200.${probableCause ? ` Probable cause: ${probableCause}` : ''}`);
             return;
         }
         let schema = null;

package/dist/watcher/logDiffResult.mjs

@@ -25,7 +25,7 @@ export default function logDiffResult(segmentName, diffResult, projectInfo) {
             diffNormalized.push({ what: 'controllerHandler', type: 'changed', name: `${handler.nameOfClass}.${name}` });
         });
     });
-    const LIMIT = 5;
+    const LIMIT = diffNormalized.length < 12 ? diffNormalized.length : 10;
     for (const diffNormalizedItem of diffNormalized.slice(0, LIMIT)) {
         switch (diffNormalizedItem.what) {
             case 'worker':
@@ -74,6 +74,6 @@ export default function logDiffResult(segmentName, diffResult, projectInfo) {
         }
     }
     if (diffNormalized.length > LIMIT) {
-        projectInfo.log.info(`...and ${diffNormalized.length - LIMIT} more changes`);
+        projectInfo.log.info(`... and ${diffNormalized.length - LIMIT} more changes`);
     }
 }

package/package.json

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