vovk-cli 0.0.1-draft.339 → 0.0.1-draft.340

package/client-templates/cjs/index.cjs.ejs

@@ -1,8 +1,7 @@
 <%- t.getFirstLineBanner() %>
-const { fetcher } = require('<%= t.imports.fetcher %>');
-const { createRPC } = require('<%= t.imports.createRPC %>');
+const { createRPC } = require('<%= t.commonImports.createRPC %>');
 const { schema } = require('./schema.cjs');
-const openapi = require('./openapi.json');
+const openapi = require('./openapi.cjs');
 const { validateOnClient = null } = <%- t.imports.validateOnClient ? `require('${t.imports.validateOnClient}')` : '{}'%>;
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
     <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhatCommaDivisible, reExportFrom]) => {
@@ -12,8 +11,8 @@ exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<
        }) %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 exports.<%= rpcModuleName %> = createRPC(
-  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
-  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
+  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', require('<%= t.segmentImports[segment.segmentName].fetcher %>').fetcher,
+  { validateOnClient: <%= t.segmentImports[segment.segmentName].validateOnClient ? `require('${t.segmentImports[segment.segmentName].validateOnClient}').validateOnClient` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
 );
   <% })
 }) %>

package/client-templates/cjs/index.d.cts.ejs

@@ -1,8 +1,6 @@
-
 <%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
-import type { fetcher } from '<%= t.imports.module.fetcher %>';
-import type { createRPC } from '<%= t.imports.module.createRPC %>';
+import type { createRPC } from '<%= t.commonImports.module.createRPC %>';
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }}) %>
@@ -10,17 +8,16 @@ import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segme
 import type { Controllers as MixinControllers, Mixins } from "./mixins";
 <% } %>
 
-type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
   <% }) %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
-export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>>;
+export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>>;
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
-export { default as openapi } from './openapi.json' assert { type: 'json' };
+export { openapi } from './openapi.cjs';
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

package/client-templates/mjs/index.d.mts.ejs

@@ -1,8 +1,6 @@
-
 <%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
-import type { fetcher } from '<%= t.imports.module.fetcher %>';
-import type { createRPC } from '<%= t.imports.module.createRPC %>';
+import type { createRPC } from '<%= t.commonImports.module.createRPC %>';
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }}) %>
@@ -10,17 +8,16 @@ import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segme
 import type { Controllers as MixinControllers, Mixins } from "./mixins";
 <% } %>
 
-type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
   <% }) %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
-export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>>;
+export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>>;
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
-export { default as openapi } from './openapi.json' with { type: 'json' };
+export { openapi } from './openapi.cjs';
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

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

@@ -1,21 +1,15 @@
 <%- t.getFirstLineBanner() %>
-import { fetcher } from '<%= t.imports.module.fetcher %>';
-import { createRPC } from '<%= t.imports.module.createRPC %>';
+import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema.cjs';
-import openapi from './openapi.json' with { type: 'json' };
-<% if (t.imports.module.validateOnClient) { %>
-import { validateOnClient } from '<%= t.imports.module.validateOnClient %>';
-<% } else { %>
-const validateOnClient = undefined;
-<% } 
-Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
+import { openapi } from './openapi.cjs';
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
   <% }) %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %> = createRPC(
-  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
-  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
+  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),
+  { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
 );
 <% 
   }); 

package/client-templates/openapiCjs/openapi.cjs.ejs

@@ -0,0 +1,4 @@
+<%- t.getFirstLineBanner() %>
+const openapi = require('./openapi.json');
+
+module.exports.openapi = openapi;

package/client-templates/openapiCjs/openapi.d.cts.ejs

@@ -0,0 +1,4 @@
+<%- t.getFirstLineBanner() %>
+import type { OpenAPIObject } from 'openapi3-ts/oas31';
+
+export const openapi: OpenAPIObject;

package/client-templates/openapiTs/openapi.ts.ejs

@@ -0,0 +1,4 @@
+<%- t.getFirstLineBanner() %>
+import openapi from './openapi.json' with { type: "json" };
+
+export { openapi };

package/client-templates/ts/index.ts.ejs

@@ -1,30 +1,23 @@
 <%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
-import { fetcher } from '<%= t.imports.fetcher %>';
-import { createRPC } from '<%= t.imports.createRPC %>';
+import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
-import openapi from './openapi.json' with { type: 'json' };
+import { openapi } from './openapi<%= t.nodeNextResolutionExt.cjs %>';
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }
 });
 if (t.hasMixins) { %>
 import type { Controllers as MixinControllers, Mixins } from "./mixins.d.ts";
-<% } 
-if (t.imports.validateOnClient) { %>
-import { validateOnClient } from '<%= t.imports.validateOnClient %>';
-<% } else { %>
-const validateOnClient = undefined;
 <% } %>
-type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {   %>
   <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
   <% }) %>   
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
-export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>(
-  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
-  { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
+export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>(
+  schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),
+  { validateOnClient: <%- t.segmentImports[segment.segmentName].module.validateOnClient ? `import('${t.segmentImports[segment.segmentName].validateOnClient}')` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
 );
 <% }) 
 }) %>

package/dist/generate/ensureClient.mjs

@@ -1,5 +1,6 @@
 import { VovkSchemaIdEnum } from 'vovk';
 import { generate } from './generate.mjs';
+import getMetaSchema from '../getProjectInfo/getMetaSchema.mjs';
 const getEmptySegmentRecordSchema = (segmentNames) => {
     const result = {};
     for (const segmentName of segmentNames) {
@@ -20,12 +21,7 @@ export default async function ensureClient(projectInfo, locatedSegments) {
         fullSchema: {
             $schema: VovkSchemaIdEnum.SCHEMA,
             segments: getEmptySegmentRecordSchema(locatedSegments.map(({ segmentName }) => segmentName)),
-            meta: {
-                $schema: VovkSchemaIdEnum.META,
-                config: {
-                    $schema: VovkSchemaIdEnum.CONFIG,
-                },
-            },
+            meta: getMetaSchema({ config: projectInfo.config, package: projectInfo.packageJson }),
         },
         locatedSegments,
     });

package/dist/generate/generate.mjs

@@ -7,7 +7,6 @@ import getClientTemplateFiles from './getClientTemplateFiles.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import pickSegmentFullSchema from '../utils/pickSegmentFullSchema.mjs';
 import removeUnlistedDirectories from '../utils/removeUnlistedDirectories.mjs';
-import getTemplateClientImports from './getTemplateClientImports.mjs';
 import writeOneClientFile, { normalizeOutTemplatePath } from './writeOneClientFile.mjs';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 import { getTsconfig } from 'get-tsconfig';
@@ -134,15 +133,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const matterResult = templateFilePath.endsWith('.ejs')
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
-            const clientImports = await getTemplateClientImports({
-                config,
-                fullSchema,
-                outCwdRelativeDir,
-            });
             const { package: packageJson, readme, origin, snippets, } = getGeneratorConfig({
                 schema: fullSchema,
                 config: templateDef.generatorConfig,
                 isBundle,
+                segmentName: null,
             });
             const openapi = vovkSchemaToOpenAPI({
                 schema: fullSchema,
@@ -160,7 +155,6 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 fullSchema: composedFullSchema,
                 prettifyClient: config.composedClient.prettifyClient,
                 segmentName: null,
-                imports: clientImports.composedClient,
                 templateContent,
                 matterResult,
                 openapi,
@@ -177,6 +171,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 vovkCliPackage,
                 isBundle,
                 origin: cliGenerateOptions?.origin ?? origin,
+                configKey: 'composedClient',
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -217,11 +212,6 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const matterResult = templateFilePath.endsWith('.ejs')
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
-            const clientImports = await getTemplateClientImports({
-                config,
-                fullSchema,
-                outCwdRelativeDir,
-            });
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
                 const { package: packageJson, readme, origin, snippets, } = getGeneratorConfig({
                     schema: fullSchema,
@@ -246,7 +236,6 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     fullSchema: segmentedFullSchema,
                     prettifyClient: config.segmentedClient.prettifyClient,
                     segmentName,
-                    imports: clientImports.segmentedClient[segmentName],
                     templateContent,
                     matterResult,
                     openapi,
@@ -263,6 +252,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     vovkCliPackage,
                     isBundle,
                     origin: cliGenerateOptions?.origin ?? origin,
+                    configKey: 'segmentedClient',
                 });
                 return {
                     written,

package/dist/generate/getProjectFullSchema.d.mts

@@ -1,6 +1,6 @@
 import { VovkStrictConfig, type VovkSchema } from 'vovk';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-import { PackageJson } from 'type-fest';
+import type { PackageJson } from 'type-fest';
 export declare function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, package: packageJson, config, }: {
     schemaOutAbsolutePath: string;
     isNextInstalled: boolean;

package/dist/generate/getTemplateClientImports.d.mts

@@ -1,13 +1,14 @@
-import type { VovkSchema, VovkStrictConfig } from 'vovk';
+import { type VovkSchema } from 'vovk';
 export type ClientImports = {
     fetcher: string;
     validateOnClient: string | null;
     createRPC: string;
 };
-export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, }: {
-    config: VovkStrictConfig;
+export default function getTemplateClientImports({ fullSchema, outCwdRelativeDir, segmentName, isBundle, }: {
     fullSchema: VovkSchema;
     outCwdRelativeDir: string;
+    segmentName: string | null;
+    isBundle: boolean;
 }): {
     composedClient: ClientImports & {
         module: ClientImports;

package/dist/generate/getTemplateClientImports.mjs

@@ -1,7 +1,8 @@
 import path from 'node:path';
+import { getGeneratorConfig } from 'vovk';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, }) {
-    const { imports } = config;
+export default function getTemplateClientImports({ fullSchema, outCwdRelativeDir, segmentName, isBundle, }) {
+    const { imports } = getGeneratorConfig({ schema: fullSchema, segmentName, isBundle });
     const getImportPath = (p, s = '') => p.startsWith('.') ? path.relative(path.join(outCwdRelativeDir, s), p) : p;
     const clientImports = {
         composedClient: {

package/dist/generate/writeOneClientFile.d.mts

@@ -2,18 +2,16 @@ import { VovkReadmeConfig, VovkSnippetsConfig, type VovkSchema, type VovkStrictC
 import type { PackageJson } from 'type-fest';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
-import type { ClientImports } from './getTemplateClientImports.mjs';
 import type { Segment } from '../locateSegments.mjs';
 import { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function normalizeOutTemplatePath(out: string, packageJson: PackageJson): string;
-export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
     fullSchema: VovkSchema;
     prettifyClient: boolean;
     segmentName: string | null;
-    imports: ClientImports;
     templateContent: string;
     matterResult: {
         data: {
@@ -35,6 +33,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     vovkCliPackage: PackageJson;
     isBundle: boolean;
     origin: string | null;
+    configKey: 'composedClient' | 'segmentedClient';
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -8,19 +8,24 @@ import TOML from '@iarna/toml';
 import prettify from '../utils/prettify.mjs';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 import { compileJSONSchemaToTypeScriptType } from '../utils/compileJSONSchemaToTypeScriptType.mjs';
+import getTemplateClientImports from './getTemplateClientImports.mjs';
 export function normalizeOutTemplatePath(out, packageJson) {
     return out.replace('[package_name]', packageJson.name?.replace(/-/g, '_') ?? 'my_package_name');
 }
-export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, 
+export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, 
+// imports,
+templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, 
 // templateDef,
-locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }) {
+locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
     const outPath = normalizeOutTemplatePath(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '', relativeDir, path.basename(templateFilePath).replace('.ejs', '')), packageJson);
-    let placeholder = `// This is a temporary placeholder to avoid compilation errors if client is imported before it's generated.
+    let placeholder = !templateFilePath.endsWith('.json.ejs')
+        ? `// This is a temporary placeholder to avoid compilation 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`;
+// Feel free to report an issue at https://github.com/finom/vovk/issues`
+        : '{}';
     placeholder = outPath.endsWith('.py') ? placeholder.replace(/\/\//g, '#') : placeholder;
     const getFirstLineBanner = (type = 'c') => {
         const text = `auto-generated by vovk-cli v${vovkCliPackage.version} at ${new Date().toISOString()}`;
@@ -44,7 +49,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         openapi,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : apiRoot,
-        imports,
+        imports: {},
         schema: fullSchema,
         VovkSchemaIdEnum,
         createCodeExamples,
@@ -61,6 +66,12 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         schemaOutDir: typeof segmentName === 'string'
             ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_FILE_NAME), config.schemaOutDir)
             : path.relative(outCwdRelativeDir, config.schemaOutDir),
+        commonImports: getTemplateClientImports({ fullSchema, isBundle, outCwdRelativeDir, segmentName })['composedClient'],
+        segmentImports: Object.fromEntries(Object.values(fullSchema.segments).map(({ segmentName: sName }) => {
+            const clientImports = getTemplateClientImports({ fullSchema, segmentName: sName, isBundle, outCwdRelativeDir });
+            const imports = configKey === 'composedClient' ? clientImports['composedClient'] : clientImports['segmentedClient'][sName];
+            return [sName, imports];
+        })),
         segmentMeta: Object.fromEntries(Object.values(fullSchema.segments).map(({ segmentName: sName, forceApiRoot }) => {
             const { routeFilePath = null } = locatedSegmentsByName[sName] ?? {};
             const segmentImportPath = routeFilePath
@@ -95,7 +106,6 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
     if (data.imports instanceof Array) {
         for (const imp of data.imports) {
             t.imports = {
-                ...t.imports,
                 [imp]: await import(imp),
             };
         }

package/dist/getProjectInfo/getConfig/getTemplateDefs.d.mts

@@ -6,10 +6,11 @@ export declare enum BuiltInTemplateName {
     schemaTs = "schemaTs",
     schemaCjs = "schemaCjs",
     schemaJson = "schemaJson",
-    standaloneTypesTs = "standaloneTypesTs",
+    openapiTs = "openapiTs",
+    openapiCjs = "openapiCjs",
+    openapiJson = "openapiJson",
     readme = "readme",
     packageJson = "packageJson",
-    openapiJson = "openapiJson",
     mixins = "mixins",
     rsSrc = "rsSrc",
     rsPkg = "rsPkg",

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -8,12 +8,13 @@ export var BuiltInTemplateName;
     BuiltInTemplateName["schemaTs"] = "schemaTs";
     BuiltInTemplateName["schemaCjs"] = "schemaCjs";
     BuiltInTemplateName["schemaJson"] = "schemaJson";
-    // types
-    BuiltInTemplateName["standaloneTypesTs"] = "standaloneTypesTs";
+    // openapi
+    BuiltInTemplateName["openapiTs"] = "openapiTs";
+    BuiltInTemplateName["openapiCjs"] = "openapiCjs";
+    BuiltInTemplateName["openapiJson"] = "openapiJson";
     // misc
     BuiltInTemplateName["readme"] = "readme";
     BuiltInTemplateName["packageJson"] = "packageJson";
-    BuiltInTemplateName["openapiJson"] = "openapiJson";
     BuiltInTemplateName["mixins"] = "mixins";
     // other languages (packages installed separately)
     BuiltInTemplateName["rsSrc"] = "rsSrc";
@@ -28,28 +29,43 @@ export var BuiltInTemplateName;
 export default function getTemplateDefs(userTemplateDefs = {}) {
     const defs = {};
     const builtInDefs = {
+        [BuiltInTemplateName.openapiTs]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiTs}/`,
+            requires: {
+                [BuiltInTemplateName.openapiJson]: './',
+            },
+        },
+        [BuiltInTemplateName.openapiCjs]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiCjs}/`,
+            requires: {
+                [BuiltInTemplateName.openapiJson]: './',
+            },
+        },
+        [BuiltInTemplateName.openapiJson]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJson}/`,
+        },
         [BuiltInTemplateName.ts]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.ts}/`,
             requires: {
-                [BuiltInTemplateName.schemaTs]: '.',
-                [BuiltInTemplateName.openapiJson]: '.',
-                [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
+                [BuiltInTemplateName.schemaTs]: './',
+                [BuiltInTemplateName.openapiTs]: './',
+                [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
         [BuiltInTemplateName.cjs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.cjs}/`,
             requires: {
-                [BuiltInTemplateName.schemaCjs]: '.',
-                [BuiltInTemplateName.openapiJson]: '.',
-                [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
+                [BuiltInTemplateName.schemaCjs]: './',
+                [BuiltInTemplateName.openapiCjs]: './',
+                [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
         [BuiltInTemplateName.mjs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjs}/`,
             requires: {
-                [BuiltInTemplateName.schemaCjs]: '.',
-                [BuiltInTemplateName.openapiJson]: '.',
-                [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
+                [BuiltInTemplateName.schemaCjs]: './',
+                [BuiltInTemplateName.openapiCjs]: './',
+                [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
         [BuiltInTemplateName.schemaTs]: {
@@ -67,9 +83,6 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.packageJson]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.packageJson}/`,
         },
-        [BuiltInTemplateName.openapiJson]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJson}/`,
-        },
         [BuiltInTemplateName.mixins]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mixins}/`,
         },
@@ -98,7 +111,7 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.pySrc]: {
             templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pySrc}/`,
             requires: {
-                [BuiltInTemplateName.schemaJson]: '.',
+                [BuiltInTemplateName.schemaJson]: './',
             },
         },
         [BuiltInTemplateName.pyPkg]: {

package/dist/getProjectInfo/getConfig/index.d.mts

@@ -58,11 +58,6 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             includeSegments?: never;
         });
         clientTemplateDefs?: Record<string, import("vovk/types").ClientTemplateDef>;
-        imports?: {
-            fetcher?: string | [string, string] | [string];
-            validateOnClient?: string | [string, string] | [string];
-            createRPC?: string | [string, string] | [string];
-        };
         rootSegmentModulesDirName?: string;
         moduleTemplates?: {
             service?: string;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -17,9 +17,9 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
     const env = process.env;
     const clientTemplateDefs = getTemplateDefs(conf.clientTemplateDefs);
     const srcRoot = await getRelativeSrcRoot({ cwd });
-    const validateOnClientImport = conf.imports?.validateOnClient ?? null;
-    const fetcherImport = conf.imports?.fetcher ?? 'vovk';
-    const createRPCImport = conf.imports?.createRPC ?? 'vovk';
+    const validateOnClientImport = conf.generatorConfig?.imports?.validateOnClient ?? null;
+    const fetcherImport = conf.generatorConfig?.imports?.fetcher ?? 'vovk';
+    const createRPCImport = conf.generatorConfig?.imports?.createRPC ?? 'vovk';
     const imports = {
         fetcher: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
         validateOnClient: typeof validateOnClientImport === 'string'
@@ -30,7 +30,6 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
     const config = {
         $schema: VovkSchemaIdEnum.CONFIG,
         clientTemplateDefs,
-        imports,
         emitConfig: [],
         composedClient: {
             ...conf.composedClient,
@@ -75,6 +74,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         libs: conf.libs ?? {},
         generatorConfig: {
             ...conf.generatorConfig,
+            imports,
             origin: (env.VOVK_ORIGIN ?? conf?.generatorConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
             segments: Object.fromEntries(await Promise.all(Object.entries(conf.generatorConfig?.segments ?? {}).map(async ([key, value]) => [
                 key,

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -24,6 +24,7 @@ export default function getMetaSchema({ config, package: packageJson, }: {
             './openapi': {
                 import: string;
                 require: string;
+                types: string;
             };
         };
         name?: string | undefined;

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -20,9 +20,10 @@ export default function getMetaSchema({ config, package: packageJson, }) {
                     types: './schema.d.cts',
                 },
                 './openapi': {
-                    import: './openapi.json',
-                    require: './openapi.json',
-                },
+                    import: './openapi.cjs',
+                    require: './openapi.cjs',
+                    types: './openapi.d.cts',
+                }
             },
         },
         ...{

package/dist/init/createConfig.mjs

@@ -36,8 +36,10 @@ export default async function createConfig({ root, log, options: { validationLib
             },
         }[validationLibrary ?? 'type'],
     };
-    config.imports ??= {};
-    config.imports.validateOnClient = validationLibrary === 'class-validator' ? 'vovk-dto/validateOnClient' : 'vovk-ajv';
+    config.generatorConfig ??= {};
+    config.generatorConfig.imports ??= {};
+    config.generatorConfig.imports.validateOnClient =
+        validationLibrary === 'class-validator' ? 'vovk-dto/validateOnClient' : 'vovk-ajv';
     if (validationLibrary && !moduleTemplates) {
         try {
             // TODO: Legacy, is it useful to keep it?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.339",
+  "version": "0.0.1-draft.340",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.401"
+    "vovk": "^3.0.0-draft.405"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.31"