vovk-cli 0.0.1-draft.55 → 0.0.1-draft.58

package/dist/dev/index.mjs

@@ -10,7 +10,7 @@ import once from 'lodash/once.js';
 import { debouncedEnsureSchemaFiles } from './ensureSchemaFiles.mjs';
 import writeOneSchemaFile from './writeOneSchemaFile.mjs';
 import logDiffResult from './logDiffResult.mjs';
-import ensureClient from './ensureClient.mjs';
+import ensureClient from '../generate/ensureClient.mjs';
 import getProjectInfo from '../getProjectInfo/index.mjs';
 import generate from '../generate/index.mjs';
 import locateSegments from '../locateSegments.mjs';

package/dist/generate/ensureClient.mjs

@@ -0,0 +1,27 @@
+import fs from 'node:fs/promises';
+import getClientTemplates from './getClientTemplates.mjs';
+export default async function ensureClient({ config, cwd, log }) {
+    const now = Date.now();
+    const { clientOutDirAbsolutePath, templateFiles } = getClientTemplates({
+        config,
+        cwd,
+        templateNames: config.experimental_clientGenerateTemplateNames,
+    });
+    const text = `// auto-generated
+// This is a temporary placeholder to avoid errors if client is imported before it's generated.
+// If you still see this text, the client is not generated yet because of an unknown problem.
+// Feel free to report an issue at https://github.com/finom/vovk/issues`;
+    let written = false;
+    for (const { outPath } of templateFiles) {
+        const existing = await fs.readFile(outPath, 'utf-8').catch(() => null);
+        if (!existing) {
+            await fs.mkdir(clientOutDirAbsolutePath, { recursive: true });
+            await fs.writeFile(outPath, text);
+            written = true;
+        }
+    }
+    if (written) {
+        log.info(`Empty client files are generated in ${Date.now() - now}ms`);
+    }
+    return { written, path: clientOutDirAbsolutePath };
+}

package/dist/generate/getClientTemplates.d.mts

@@ -7,5 +7,8 @@ export default function getClientTemplates({ config, cwd, templateNames, }: {
     config: Required<VovkConfig>;
     cwd: string;
     templateNames?: string[];
-}): ClientTemplate[];
+}): {
+    clientOutDirAbsolutePath: string;
+    templateFiles: ClientTemplate[];
+};
 export {};

package/dist/generate/getClientTemplates.mjs

@@ -24,5 +24,5 @@ export default function getClientTemplates({ config, cwd, templateNames = [], })
             },
         ];
     }, []);
-    return templateFiles;
+    return { clientOutDirAbsolutePath, templateFiles };
 }

package/dist/generate/index.mjs

@@ -8,8 +8,7 @@ export default async function generate({ projectInfo, segments, segmentsSchema,
     templates = templates ?? projectInfo.config.experimental_clientGenerateTemplateNames;
     const noClient = templates?.[0] === 'none';
     const { config, cwd, log, validateOnClientImportPath, apiRoot, fetcherClientImportPath, createRPCImportPath, schemaOutImportPath, } = projectInfo;
-    const clientOutDirAbsolutePath = path.resolve(cwd, config.clientOutDir);
-    const templateFiles = getClientTemplates({ config, cwd, templateNames: templates });
+    const { clientOutDirAbsolutePath, templateFiles } = getClientTemplates({ config, cwd, templateNames: templates });
     // Ensure that each segment has a matching schema if it needs to be emitted:
     for (let i = 0; i < segments.length; i++) {
         const { segmentName } = segments[i];

package/dist/getProjectInfo/getConfig.mjs

@@ -8,8 +8,8 @@ export default async function getConfig({ clientOutDir, cwd }) {
     const config = {
         modulesDir: env.VOVK_MODULES_DIR ?? conf.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
         validateOnClientPath: env.VOVK_VALIDATE_ON_CLIENT_PATH ?? conf.validateOnClientPath ?? null,
-        fetcherPath: env.VOVK_FETCHER_PATH ?? conf.fetcherPath ?? 'vovk/dist/client/defaultFetcher',
-        createRPCPath: env.VOVK_CREATE_RPC_PATH ?? conf.createRPCPath ?? 'vovk/dist/client/createRPC',
+        fetcherPath: env.VOVK_FETCHER_PATH ?? conf.fetcherPath ?? 'vovk/dist/client/defaultFetcher.js',
+        createRPCPath: env.VOVK_CREATE_RPC_PATH ?? conf.createRPCPath ?? 'vovk/dist/client/createRPC.js',
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',
         clientOutDir: clientOutDir ?? env.VOVK_CLIENT_OUT_DIR ?? conf.clientOutDir ?? './node_modules/.vovk-client',
         origin: (env.VOVK_ORIGIN ?? conf.origin ?? '').replace(/\/$/, ''), // Remove trailing slash

package/dist/getProjectInfo/index.mjs

@@ -8,7 +8,8 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, cw
     const { config, srcRoot, configAbsolutePaths, userConfig, error } = await getConfig({ clientOutDir, cwd });
     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
+    const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir).replace(/\\/g, '/') + // windows fix
+        'index.js';
     const fetcherClientImportPath = config.fetcherPath.startsWith('.')
         ? path.relative(config.clientOutDir, config.fetcherPath)
         : config.fetcherPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.55",
+  "version": "0.0.1-draft.58",
   "bin": {
     "vovk": "./dist/index.mjs"
   },

package/dist/dev/ensureClient.mjs

@@ -1,30 +0,0 @@
-import path from 'node:path';
-import fs from 'node:fs/promises';
-export default async function ensureClient({ config, cwd, log }) {
-    const now = Date.now();
-    const clientoOutDirAbsolutePath = path.join(cwd, config.clientOutDir);
-    const dts = `// auto-generated
-// This is a temporary placeholder to avoid errors if client is imported before it's generated.
-// If you still see this text, the client is not generated yet because of an unknown problem.
-// Feel free to report an issue at https://github.com/finom/vovk/issues`;
-    const js = dts;
-    const ts = dts;
-    const localJsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'compiled.js');
-    const localDtsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'compiled.d.ts');
-    const localTsAbsolutePath = path.join(clientoOutDirAbsolutePath, 'index.ts');
-    const existingJs = await fs.readFile(localJsAbsolutePath, 'utf-8').catch(() => null);
-    const existingDts = await fs.readFile(localDtsAbsolutePath, 'utf-8').catch(() => null);
-    const existingTs = await fs.readFile(localTsAbsolutePath, 'utf-8').catch(() => null);
-    if (existingJs && existingDts && existingTs) {
-        return { written: false, path: clientoOutDirAbsolutePath };
-    }
-    await fs.mkdir(clientoOutDirAbsolutePath, { recursive: true });
-    if (!existingJs)
-        await fs.writeFile(localJsAbsolutePath, js);
-    if (!existingDts)
-        await fs.writeFile(localDtsAbsolutePath, dts);
-    if (!existingTs)
-        await fs.writeFile(localTsAbsolutePath, ts);
-    log.info(`Empty client files are generated in ${Date.now() - now}ms`);
-    return { written: true, path: clientoOutDirAbsolutePath };
-}