vovk-cli 0.0.1-draft.115 → 0.0.1-draft.116

package/dist/getProjectInfo/getConfig.mjs

@@ -5,16 +5,18 @@ export default async function getConfig({ clientOutDir, configPath, cwd, }) {
     const { configAbsolutePaths, error, userConfig } = await getUserConfig({ configPath, cwd });
     const conf = userConfig ?? {};
     const srcRoot = await getRelativeSrcRoot({ cwd });
-    const validateOnClientImport = env.VOVK_VALIDATE_ON_CLIENT_PATH ?? conf.validateOnClientImport ?? null;
-    const fetcherImport = env.VOVK_FETCHER_PATH ?? conf.fetcherImport ?? 'vovk';
-    const createRPCImport = env.VOVK_CREATE_RPC_PATH ?? conf.createRPCImport ?? 'vovk';
-    const defaultClientTemplates = ['ts', 'module', 'main'];
+    const validateOnClientImport = env.VOVK_VALIDATE_ON_CLIENT_PATH ?? conf.imports?.validateOnClient ?? null;
+    const fetcherImport = env.VOVK_FETCHER_PATH ?? conf.imports?.fetcher ?? 'vovk';
+    const createRPCImport = env.VOVK_CREATE_RPC_PATH ?? conf.imports?.createRPC ?? 'vovk';
+    const defaultClientTemplates = ['module', 'main'];
     const config = {
         emitConfig: [],
         modulesDir: env.VOVK_MODULES_DIR ?? conf.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
-        validateOnClientImport: typeof validateOnClientImport === 'string' ? [validateOnClientImport] : validateOnClientImport,
-        fetcherImport: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
-        createRPCImport: typeof createRPCImport === 'string' ? [createRPCImport] : createRPCImport,
+        imports: {
+            fetcher: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
+            validateOnClient: typeof validateOnClientImport === 'string' ? [validateOnClientImport] : (validateOnClientImport ?? null),
+            createRPC: typeof createRPCImport === 'string' ? [createRPCImport, 'vovk'] : createRPCImport,
+        },
         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
@@ -25,7 +27,7 @@ export default async function getConfig({ clientOutDir, configPath, cwd, }) {
         devHttps: (env.VOVK_DEV_HTTPS ? !!env.VOVK_DEV_HTTPS : null) ?? conf.devHttps ?? false,
         generateFrom: typeof conf.generateFrom === 'function'
             ? conf.generateFrom(defaultClientTemplates)
-            : (conf.generateFrom ?? ['ts', 'module', 'main']),
+            : (conf.generateFrom ?? defaultClientTemplates),
         templates: {
             service: 'vovk-cli/templates/service.ejs',
             controller: 'vovk-cli/templates/controller.ejs',

package/dist/getProjectInfo/index.mjs

@@ -21,14 +21,14 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, co
     }
     const getImportPath = (p) => (p.startsWith('.') ? path.relative(config.clientOutDir, p) : p);
     const clientImports = {
-        fetcher: getImportPath(config.fetcherImport[0]),
-        createRPC: getImportPath(config.createRPCImport[0]),
-        validateOnClient: config.validateOnClientImport ? getImportPath(config.validateOnClientImport[0]) : null,
+        fetcher: getImportPath(config.imports.fetcher[0]),
+        createRPC: getImportPath(config.imports.createRPC[0]),
+        validateOnClient: config.imports.validateOnClient ? getImportPath(config.imports.validateOnClient[0]) : null,
         module: {
-            fetcher: getImportPath(config.fetcherImport[1] ?? config.fetcherImport[0]),
-            createRPC: getImportPath(config.createRPCImport[1] ?? config.createRPCImport[0]),
-            validateOnClient: config.validateOnClientImport
-                ? getImportPath(config.validateOnClientImport[1] ?? config.validateOnClientImport[0])
+            fetcher: getImportPath(config.imports.fetcher[1] ?? config.imports.fetcher[0]),
+            createRPC: getImportPath(config.imports.createRPC[1] ?? config.imports.createRPC[0]),
+            validateOnClient: config.imports.validateOnClient
+                ? getImportPath(config.imports.validateOnClient[1] ?? config.imports.validateOnClient[0])
                 : null,
         },
     };

package/dist/init/createConfig.mjs

@@ -16,7 +16,8 @@ export default async function createConfig({ root, log, options: { validationLib
         service: 'vovk-cli/templates/service.ejs',
     };
     if (validationLibrary) {
-        config.validateOnClientImport =
+        config.imports ??= {};
+        config.imports.validateOnClient =
             {
                 'vovk-dto': `vovk-dto/validateOnClient.js`,
             }[validationLibrary] ?? 'vovk-ajv';
@@ -29,7 +30,8 @@ export default async function createConfig({ root, log, options: { validationLib
         }
     }
     if (reactQuery) {
-        config.createRPCImport = 'vovk-react-query';
+        config.imports ??= {};
+        config.imports.createRPC = 'vovk-react-query';
     }
     config.templates = templates;
     const configStr = await prettify(`/** @type {import('vovk-cli').VovkConfig} */

package/dist/init/index.mjs

@@ -176,18 +176,18 @@ export class Init {
         updateScripts =
             updateScripts ??
                 (await select({
-                    message: 'Do you want to update package.json by adding "generate" and updating "dev" NPM scripts?',
+                    message: 'Do you want to update "dev" NPM script at package.json?',
                     default: 'implicit',
                     choices: [
                         {
                             name: 'Yes, use "concurrently" implicitly',
                             value: 'implicit',
-                            description: `The "dev" script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)}`,
+                            description: `The script will use "concurrently" API to run "next dev" and "vovk dev" commands together and automatically find an available port ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'implicit')}"`)}`,
                         },
                         {
                             name: 'Yes, use "concurrently" explicitly',
                             value: 'explicit',
-                            description: `The "dev" script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)}`,
+                            description: `The script will use pre-defined PORT variable and run "next dev" and "vovk dev" as "concurrently" CLI arguments ${chalk.whiteBright.bold(`"${getDevScript(pkgJson, 'explicit')}"`)}`,
                         },
                         {
                             name: 'No',

package/dist/locateSegments.d.mts

@@ -1,4 +1,4 @@
-import type { VovkConfig } from 'vovk';
+import type { VovkStrictConfig } from 'vovk';
 export type Segment = {
     routeFilePath: string;
     segmentName: string;
@@ -7,5 +7,5 @@ export type Segment = {
 export default function locateSegments({ dir, rootDir, config, }: {
     dir: string;
     rootDir?: string;
-    config: Required<VovkConfig> | null;
+    config: VovkStrictConfig | null;
 }): Promise<Segment[]>;

package/dist/new/render.d.mts

@@ -1,8 +1,8 @@
-import type { VovkConfig } from 'vovk';
+import type { VovkStrictConfig } from 'vovk';
 import type { VovkModuleRenderResult } from '../types.mjs';
 export default function render(codeTemplate: string, { config, withService, segmentName, moduleName, empty, templateFileName, }: {
     cwd: string;
-    config: VovkConfig;
+    config: VovkStrictConfig;
     withService: boolean;
     segmentName: string;
     moduleName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.115",
+  "version": "0.0.1-draft.116",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.108"
+    "vovk": "^3.0.0-draft.109"
   },
   "optionalDependencies": {
     "vovk-python-client": "*"