vovk-cli 0.0.1-draft.63 → 0.0.1-draft.65

package/client-templates/module/module.mjs.ejs

@@ -1,14 +1,16 @@
 <%- '// auto-generated\n/* eslint-disable */' %>
 import fetcherImport from '<%= fetcherClientImportPath %>';
-import createRPC from '<%= createRPCImportPath %>';
+import createRPCImport from '<%= createRPCImportPath %>';
 import schema from '<%= schemaOutImportPath %>';
 <% if (validateOnClientImportPath) { %>
-import validateOnClient from '<%= validateOnClientImportPath %>';
+import validateOnClientImport from '<%= validateOnClientImportPath %>';
+const validateOnClient = validateOnClientImport.default || validateOnClientImport;
 <% } else { %>
 const validateOnClient = undefined;
 <% } %>
 const apiRoot = '<%= apiRoot %>';
 const fetcher = fetcherImport.default || fetcherImport;
+const createRPC = createRPCImport.default || createRPCImport;
 <% segments.forEach((segment, i) => {
   Object.keys(segmentsSchema[segment.segmentName].controllers).forEach((key) => { %>
 export const <%= key %> = createRPC(

package/dist/dev/ensureSchemaFiles.mjs

@@ -22,8 +22,8 @@ declare const segmentSchema: {
 ${segmentNames.map((segmentName) => `  '${segmentName}': VovkSchema;`).join('\n')}
 };
 export default segmentSchema;`;
-    const jsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.js');
-    const dTsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.d.ts');
+    const jsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.cjs');
+    const dTsAbsolutePath = path.join(schemaOutAbsolutePath, 'index.d.cts');
     const existingJs = await fs.readFile(jsAbsolutePath, 'utf-8').catch(() => null);
     const existingDTs = await fs.readFile(dTsAbsolutePath, 'utf-8').catch(() => null);
     await fs.mkdir(schemaOutAbsolutePath, { recursive: true });

package/dist/generate/index.d.mts

@@ -2,10 +2,11 @@ import type { VovkSchema } from 'vovk';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import type { Segment } from '../locateSegments.mjs';
 import { GenerateOptions } from '../types.mjs';
-export default function generate({ projectInfo, segments, segmentsSchema, templates, prettify: prettifyClient, fullSchema, }: {
+export default function generate({ projectInfo, segments, segmentsSchema, forceNothingWrittenLog, templates, prettify: prettifyClient, fullSchema, }: {
     projectInfo: ProjectInfo;
     segments: Segment[];
     segmentsSchema: Record<string, VovkSchema>;
+    forceNothingWrittenLog?: boolean;
 } & Pick<GenerateOptions, 'templates' | 'prettify' | 'fullSchema'>): Promise<{
     written: boolean;
     path: string;

package/dist/generate/index.mjs

@@ -4,7 +4,7 @@ import ejs from 'ejs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import prettify from '../utils/prettify.mjs';
 import getClientTemplates from './getClientTemplates.mjs';
-export default async function generate({ projectInfo, segments, segmentsSchema, templates, prettify: prettifyClient, fullSchema, }) {
+export default async function generate({ projectInfo, segments, segmentsSchema, forceNothingWrittenLog, templates, prettify: prettifyClient, fullSchema, }) {
     templates = templates ?? projectInfo.config.experimental_clientGenerateTemplateNames;
     const noClient = templates?.[0] === 'none';
     const { config, cwd, log, validateOnClientImportPath, apiRoot, fetcherClientImportPath, createRPCImportPath, schemaOutImportPath, } = projectInfo;
@@ -63,7 +63,8 @@ export default async function generate({ projectInfo, segments, segmentsSchema,
         log.info(`Full schema has ben written to ${fullSchemaOutAbsolutePath}`);
     }
     if (!anyNeedsWriting) {
-        log.debug(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
+        const logOrDebug = forceNothingWrittenLog ? log.info : log.debug;
+        logOrDebug(`Client is up to date and doesn't need to be regenerated (${Date.now() - now}ms)`);
         return { written: false, path: clientOutDirAbsolutePath };
     }
     // Write updated files where needed

package/dist/getProjectInfo/index.mjs

@@ -9,7 +9,7 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, cw
     const apiRoot = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
     const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir).replace(/\\/g, '/') + // windows fix
-        '/index.js';
+        '/index.cjs';
     const fetcherClientImportPath = config.fetcherPath.startsWith('.')
         ? path.relative(config.clientOutDir, config.fetcherPath)
         : config.fetcherPath;

package/dist/index.mjs

@@ -83,9 +83,17 @@ program
     const { cwd, config, apiDir } = projectInfo;
     const segments = await locateSegments({ dir: apiDir, config });
     const schemaOutAbsolutePath = path.join(cwd, config.schemaOutDir);
-    const schemaImportUrl = pathToFileURL(path.join(schemaOutAbsolutePath, 'index.js')).href;
+    const schemaImportUrl = pathToFileURL(path.join(schemaOutAbsolutePath, 'index.cjs')).href;
     const { default: segmentsSchema } = (await import(schemaImportUrl));
-    await generate({ projectInfo, segments, segmentsSchema, templates, prettify, fullSchema });
+    await generate({
+        projectInfo,
+        segments,
+        segmentsSchema,
+        templates,
+        prettify,
+        fullSchema,
+        forceNothingWrittenLog: true,
+    });
 });
 program
     .command('new [components...]')

package/dist/init/createConfig.mjs

@@ -17,7 +17,7 @@ export default async function createConfig({ root, log, options: { validationLib
     };
     if (validationLibrary) {
         if (validateOnClient) {
-            config.validateOnClientPath = `${validationLibrary}/validateOnClient`;
+            config.validateOnClientPath = `${validationLibrary}/validateOnClient/index.js`;
         }
         try {
             const validationTemplates = await getTemplateFilesFromPackage(validationLibrary, channel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.63",
+  "version": "0.0.1-draft.65",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.58"
+    "vovk": "^3.0.0-draft.65"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.3.1",