vovk 3.0.0-draft.404 → 3.0.0-draft.405

package/cjs/client/createRPC.d.ts

@@ -1,3 +1,5 @@
 import type { KnownAny } from '../types';
 import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, fetcher?: VovkClientFetcher<OPTS>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, givenFetcher?: VovkClientFetcher<OPTS> | Promise<{
+    fetcher: VovkClientFetcher<OPTS>;
+}>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -17,9 +17,9 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (givenSchema, segmentName, rpcModuleName, fetcher, options) => {
+const createRPC = (givenSchema, segmentName, rpcModuleName, givenFetcher, options) => {
     const schema = givenSchema; // fixes incompatibilities with JSON module
-    fetcher ??= fetcher_1.fetcher;
+    // fetcher ??= defaultFetcher as NonNullable<typeof fetcher>;
     const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
@@ -47,8 +47,14 @@ const createRPC = (givenSchema, segmentName, rpcModuleName, fetcher, options) =>
             return endpoint;
         };
         const handler = (async (input = {}) => {
+            const fetcher = givenFetcher instanceof Promise
+                ? (await givenFetcher).fetcher
+                : (givenFetcher ?? fetcher_1.fetcher);
             const validate = async (validationInput, { endpoint, }) => {
-                const validateOnClient = input.validateOnClient ?? options?.validateOnClient;
+                const validateOnClient = input.validateOnClient ??
+                    (options?.validateOnClient instanceof Promise
+                        ? (await options?.validateOnClient)?.validateOnClient
+                        : options?.validateOnClient);
                 if (validateOnClient && validation) {
                     if (typeof validateOnClient !== 'function') {
                         throw new Error('validateOnClient must be a function');

package/cjs/client/fetcher.d.ts

@@ -11,7 +11,9 @@ export declare function createFetcher<T>({ prepareRequestInit, transformResponse
 export declare const fetcher: VovkClientFetcher<{
     apiRoot?: string;
     disableClientValidation?: boolean;
-    validateOnClient?: import("./types").VovkValidateOnClient<unknown> | undefined;
+    validateOnClient?: import("./types").VovkValidateOnClient<unknown> | Promise<{
+        validateOnClient: import("./types").VovkValidateOnClient<unknown>;
+    }> | undefined;
     interpretAs?: string;
     init?: RequestInit;
 }>;

package/cjs/client/types.d.ts

@@ -101,7 +101,9 @@ export type VovkClientFetcher<TFetcherOptions> = (options: {
 export type VovkDefaultFetcherOptions<T> = T & {
     apiRoot?: string;
     disableClientValidation?: boolean;
-    validateOnClient?: VovkValidateOnClient<T>;
+    validateOnClient?: VovkValidateOnClient<T> | Promise<{
+        validateOnClient: VovkValidateOnClient<T>;
+    }>;
     interpretAs?: string;
     init?: RequestInit;
 };

package/cjs/openapi/openAPIToVovkSchema/index.d.ts

@@ -1,4 +1,4 @@
 import { VovkOpenAPIMixinNormalized, type VovkSchema } from '../../types';
-export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, segmentName, }: VovkOpenAPIMixinNormalized & {
+export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, segmentName, }: VovkOpenAPIMixinNormalized & {
     segmentName?: string;
 }): VovkSchema;

package/cjs/openapi/openAPIToVovkSchema/index.js

@@ -4,7 +4,7 @@ exports.openAPIToVovkSchema = openAPIToVovkSchema;
 const types_1 = require("../../types");
 const applyComponentsSchemas_1 = require("./applyComponentsSchemas");
 const inlineRefs_1 = require("./inlineRefs");
-function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, segmentName, }) {
+function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, segmentName, }) {
     segmentName = segmentName ?? '';
     const forceApiRoot = apiRoot ??
         openAPIObject.servers?.[0]?.url ??
@@ -26,12 +26,6 @@ function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getMo
                 controllers: {},
                 meta: {
                     openAPIObject: noPathsOpenAPIObject,
-                    package: Object.assign({}, noPathsOpenAPIObject.info
-                        ? {
-                            description: packageJson?.description ??
-                                `**${noPathsOpenAPIObject.info.title}**\n${noPathsOpenAPIObject.info.description ?? ''}`,
-                        }
-                        : {}, packageJson),
                 },
             },
         },

package/cjs/openapi/vovkSchemaToOpenAPI.js

@@ -50,7 +50,7 @@ function vovkSchemaToOpenAPI({ rootEntry = 'api', schema: fullSchema, config, se
     const { openAPIObject, snippets: snippetsConfig, package: packageJson, } = (0, getGeneratorConfig_1.getGeneratorConfig)({
         schema: fullSchema,
         config,
-        segmentName: givenSegmentName,
+        segmentName: givenSegmentName ?? null,
     });
     for (const [segmentName, segmentSchema] of givenSegmentName
         ? [[givenSegmentName, fullSchema.segments[givenSegmentName]]]

package/cjs/types.d.ts

@@ -338,6 +338,11 @@ export interface VovkGeneratorConfigCommon {
     snippets?: VovkSnippetsConfig;
     openAPIObject?: Partial<OpenAPIObject>;
     reExports?: Record<string, string>;
+    imports?: {
+        fetcher?: string | [string, string] | [string];
+        validateOnClient?: string | [string, string] | [string] | null;
+        createRPC?: string | [string, string] | [string];
+    };
 }
 export type ClientTemplateDef = {
     extends?: string;
@@ -362,9 +367,6 @@ export interface VovkOpenAPIMixin {
     } | {
         object: OpenAPIObject;
     };
-    package?: VovkPackageJson;
-    readme?: VovkReadmeConfig;
-    snippets?: VovkSnippetsConfig;
     apiRoot?: string;
     getModuleName?: 'nestjs-operation-id' | (string & {}) | 'api' | GetOpenAPINameFn;
     getMethodName?: 'nestjs-operation-id' | 'camel-case-operation-id' | 'auto' | GetOpenAPINameFn;
@@ -387,8 +389,13 @@ export interface VovkSegmentConfig extends VovkGeneratorConfigCommon {
 export interface VovkGeneratorConfig extends VovkGeneratorConfigCommon {
     segments?: Record<string, VovkSegmentConfig>;
 }
-interface ProjectConfigStrict extends Omit<VovkGeneratorConfig, 'origin' | 'segments'> {
+export interface VovkGeneratorConfigStrict extends Omit<VovkGeneratorConfig, 'origin' | 'segments' | 'imports'> {
     origin: string;
+    imports: {
+        fetcher: [string, string] | [string];
+        validateOnClient: [string, string] | [string] | null;
+        createRPC: [string, string] | [string];
+    };
     segments?: Record<string, Omit<VovkSegmentConfig, 'openAPIMixin'> & {
         openAPIMixin: VovkOpenAPIMixinNormalized;
     }>;
@@ -409,11 +416,6 @@ type VovkUserConfig = {
     segmentedClient?: ClientConfigSegmented;
     bundle?: BundleConfig;
     clientTemplateDefs?: Record<string, ClientTemplateDef>;
-    imports?: {
-        fetcher?: string | [string, string] | [string];
-        validateOnClient?: string | [string, string] | [string];
-        createRPC?: string | [string, string] | [string];
-    };
     rootSegmentModulesDirName?: string;
     moduleTemplates?: {
         service?: string;
@@ -426,15 +428,10 @@ export type VovkConfig = VovkUserConfig;
 export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'libs' | 'imports' | 'composedClient' | 'segmentedClient' | 'bundle' | 'extendClientWithOpenAPI' | 'generator'>> & {
     emitConfig: (keyof VovkStrictConfig | string)[];
     bundle: RequireAllExcept<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>;
-    imports: {
-        fetcher: [string, string] | [string];
-        validateOnClient: [string, string] | [string] | null;
-        createRPC: [string, string] | [string];
-    };
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
-    generatorConfig: ProjectConfigStrict;
+    generatorConfig: VovkGeneratorConfigStrict;
 };
 export type RequireFields<T, K extends keyof T> = T & Required<Pick<T, K>>;
 export type RequireAllExcept<T, K extends keyof T> = Required<Omit<T, K>> & Pick<T, K>;

package/cjs/utils/getGeneratorConfig.d.ts

@@ -1,10 +1,10 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkGeneratorConfigCommon, VovkReadmeConfig, VovkSnippetsConfig, VovkSchema } from '../types';
+import type { VovkGeneratorConfigCommon, VovkReadmeConfig, VovkSnippetsConfig, VovkSchema, VovkGeneratorConfigStrict } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function getGeneratorConfig({ schema, config, segmentName, isBundle, }: {
     schema: VovkSchema;
     config?: VovkGeneratorConfigCommon;
-    segmentName?: string;
+    segmentName: string | null;
     isBundle?: boolean;
 }): {
     readme: VovkReadmeConfig;
@@ -12,4 +12,5 @@ export declare function getGeneratorConfig({ schema, config, segmentName, isBund
     snippets: VovkSnippetsConfig;
     origin: string;
     package: PackageJson;
+    imports: VovkGeneratorConfigStrict['imports'];
 };

package/cjs/utils/getGeneratorConfig.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGeneratorConfig = getGeneratorConfig;
 const deepExtend_1 = __importDefault(require("./deepExtend"));
 function getGeneratorConfig({ schema, config, segmentName, isBundle, }) {
-    const packageJson = (0, deepExtend_1.default)({}, schema.meta?.package, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, segmentName ? schema.segments?.[segmentName]?.meta?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.package : undefined, config?.package);
+    const packageJson = (0, deepExtend_1.default)({}, schema.meta?.package, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, segmentName ? schema.segments?.[segmentName]?.meta?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package : undefined, config?.package);
     return {
         package: packageJson,
         openAPIObject: (0, deepExtend_1.default)({}, {
@@ -16,12 +16,17 @@ function getGeneratorConfig({ schema, config, segmentName, isBundle, }) {
                 description: packageJson.description,
             },
         }, schema.meta?.config?.generatorConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.openAPIObject : undefined, segmentName ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIObject : undefined, config?.openAPIObject),
-        snippets: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.snippets, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.snippets : undefined, config?.snippets),
-        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.readme : undefined, config?.readme),
+        snippets: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.snippets, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.snippets : undefined, config?.snippets),
+        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme : undefined, config?.readme),
         origin: config?.origin ||
             schema.meta?.config?.generatorConfig?.origin ||
             (segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.origin : undefined) ||
             (isBundle ? schema.meta?.config?.bundle?.generatorConfig?.origin : undefined) ||
             '',
+        imports: (0, deepExtend_1.default)({
+            fetcher: ['vovk'],
+            validateOnClient: null,
+            createRPC: ['vovk'],
+        }, schema.meta?.config?.generatorConfig?.imports, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.imports : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.imports : undefined, config?.imports),
     };
 }

package/mjs/client/createRPC.d.ts

@@ -1,3 +1,5 @@
 import type { KnownAny } from '../types';
 import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, fetcher?: VovkClientFetcher<OPTS>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, givenFetcher?: VovkClientFetcher<OPTS> | Promise<{
+    fetcher: VovkClientFetcher<OPTS>;
+}>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;

package/mjs/client/createRPC.js

@@ -17,9 +17,9 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (givenSchema, segmentName, rpcModuleName, fetcher, options) => {
+const createRPC = (givenSchema, segmentName, rpcModuleName, givenFetcher, options) => {
     const schema = givenSchema; // fixes incompatibilities with JSON module
-    fetcher ??= fetcher_1.fetcher;
+    // fetcher ??= defaultFetcher as NonNullable<typeof fetcher>;
     const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
@@ -47,8 +47,14 @@ const createRPC = (givenSchema, segmentName, rpcModuleName, fetcher, options) =>
             return endpoint;
         };
         const handler = (async (input = {}) => {
+            const fetcher = givenFetcher instanceof Promise
+                ? (await givenFetcher).fetcher
+                : (givenFetcher ?? fetcher_1.fetcher);
             const validate = async (validationInput, { endpoint, }) => {
-                const validateOnClient = input.validateOnClient ?? options?.validateOnClient;
+                const validateOnClient = input.validateOnClient ??
+                    (options?.validateOnClient instanceof Promise
+                        ? (await options?.validateOnClient)?.validateOnClient
+                        : options?.validateOnClient);
                 if (validateOnClient && validation) {
                     if (typeof validateOnClient !== 'function') {
                         throw new Error('validateOnClient must be a function');

package/mjs/client/fetcher.d.ts

@@ -11,7 +11,9 @@ export declare function createFetcher<T>({ prepareRequestInit, transformResponse
 export declare const fetcher: VovkClientFetcher<{
     apiRoot?: string;
     disableClientValidation?: boolean;
-    validateOnClient?: import("./types").VovkValidateOnClient<unknown> | undefined;
+    validateOnClient?: import("./types").VovkValidateOnClient<unknown> | Promise<{
+        validateOnClient: import("./types").VovkValidateOnClient<unknown>;
+    }> | undefined;
     interpretAs?: string;
     init?: RequestInit;
 }>;

package/mjs/client/types.d.ts

@@ -101,7 +101,9 @@ export type VovkClientFetcher<TFetcherOptions> = (options: {
 export type VovkDefaultFetcherOptions<T> = T & {
     apiRoot?: string;
     disableClientValidation?: boolean;
-    validateOnClient?: VovkValidateOnClient<T>;
+    validateOnClient?: VovkValidateOnClient<T> | Promise<{
+        validateOnClient: VovkValidateOnClient<T>;
+    }>;
     interpretAs?: string;
     init?: RequestInit;
 };

package/mjs/openapi/openAPIToVovkSchema/index.d.ts

@@ -1,4 +1,4 @@
 import { VovkOpenAPIMixinNormalized, type VovkSchema } from '../../types';
-export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, segmentName, }: VovkOpenAPIMixinNormalized & {
+export declare function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, segmentName, }: VovkOpenAPIMixinNormalized & {
     segmentName?: string;
 }): VovkSchema;

package/mjs/openapi/openAPIToVovkSchema/index.js

@@ -4,7 +4,7 @@ exports.openAPIToVovkSchema = openAPIToVovkSchema;
 const types_1 = require("../../types");
 const applyComponentsSchemas_1 = require("./applyComponentsSchemas");
 const inlineRefs_1 = require("./inlineRefs");
-function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, package: packageJson, segmentName, }) {
+function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getModuleName, getMethodName, errorMessageKey, segmentName, }) {
     segmentName = segmentName ?? '';
     const forceApiRoot = apiRoot ??
         openAPIObject.servers?.[0]?.url ??
@@ -26,12 +26,6 @@ function openAPIToVovkSchema({ apiRoot, source: { object: openAPIObject }, getMo
                 controllers: {},
                 meta: {
                     openAPIObject: noPathsOpenAPIObject,
-                    package: Object.assign({}, noPathsOpenAPIObject.info
-                        ? {
-                            description: packageJson?.description ??
-                                `**${noPathsOpenAPIObject.info.title}**\n${noPathsOpenAPIObject.info.description ?? ''}`,
-                        }
-                        : {}, packageJson),
                 },
             },
         },

package/mjs/openapi/vovkSchemaToOpenAPI.js

@@ -50,7 +50,7 @@ function vovkSchemaToOpenAPI({ rootEntry = 'api', schema: fullSchema, config, se
     const { openAPIObject, snippets: snippetsConfig, package: packageJson, } = (0, getGeneratorConfig_1.getGeneratorConfig)({
         schema: fullSchema,
         config,
-        segmentName: givenSegmentName,
+        segmentName: givenSegmentName ?? null,
     });
     for (const [segmentName, segmentSchema] of givenSegmentName
         ? [[givenSegmentName, fullSchema.segments[givenSegmentName]]]

package/mjs/types.d.ts

@@ -338,6 +338,11 @@ export interface VovkGeneratorConfigCommon {
     snippets?: VovkSnippetsConfig;
     openAPIObject?: Partial<OpenAPIObject>;
     reExports?: Record<string, string>;
+    imports?: {
+        fetcher?: string | [string, string] | [string];
+        validateOnClient?: string | [string, string] | [string] | null;
+        createRPC?: string | [string, string] | [string];
+    };
 }
 export type ClientTemplateDef = {
     extends?: string;
@@ -362,9 +367,6 @@ export interface VovkOpenAPIMixin {
     } | {
         object: OpenAPIObject;
     };
-    package?: VovkPackageJson;
-    readme?: VovkReadmeConfig;
-    snippets?: VovkSnippetsConfig;
     apiRoot?: string;
     getModuleName?: 'nestjs-operation-id' | (string & {}) | 'api' | GetOpenAPINameFn;
     getMethodName?: 'nestjs-operation-id' | 'camel-case-operation-id' | 'auto' | GetOpenAPINameFn;
@@ -387,8 +389,13 @@ export interface VovkSegmentConfig extends VovkGeneratorConfigCommon {
 export interface VovkGeneratorConfig extends VovkGeneratorConfigCommon {
     segments?: Record<string, VovkSegmentConfig>;
 }
-interface ProjectConfigStrict extends Omit<VovkGeneratorConfig, 'origin' | 'segments'> {
+export interface VovkGeneratorConfigStrict extends Omit<VovkGeneratorConfig, 'origin' | 'segments' | 'imports'> {
     origin: string;
+    imports: {
+        fetcher: [string, string] | [string];
+        validateOnClient: [string, string] | [string] | null;
+        createRPC: [string, string] | [string];
+    };
     segments?: Record<string, Omit<VovkSegmentConfig, 'openAPIMixin'> & {
         openAPIMixin: VovkOpenAPIMixinNormalized;
     }>;
@@ -409,11 +416,6 @@ type VovkUserConfig = {
     segmentedClient?: ClientConfigSegmented;
     bundle?: BundleConfig;
     clientTemplateDefs?: Record<string, ClientTemplateDef>;
-    imports?: {
-        fetcher?: string | [string, string] | [string];
-        validateOnClient?: string | [string, string] | [string];
-        createRPC?: string | [string, string] | [string];
-    };
     rootSegmentModulesDirName?: string;
     moduleTemplates?: {
         service?: string;
@@ -426,15 +428,10 @@ export type VovkConfig = VovkUserConfig;
 export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'libs' | 'imports' | 'composedClient' | 'segmentedClient' | 'bundle' | 'extendClientWithOpenAPI' | 'generator'>> & {
     emitConfig: (keyof VovkStrictConfig | string)[];
     bundle: RequireAllExcept<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>;
-    imports: {
-        fetcher: [string, string] | [string];
-        validateOnClient: [string, string] | [string] | null;
-        createRPC: [string, string] | [string];
-    };
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
-    generatorConfig: ProjectConfigStrict;
+    generatorConfig: VovkGeneratorConfigStrict;
 };
 export type RequireFields<T, K extends keyof T> = T & Required<Pick<T, K>>;
 export type RequireAllExcept<T, K extends keyof T> = Required<Omit<T, K>> & Pick<T, K>;

package/mjs/utils/getGeneratorConfig.d.ts

@@ -1,10 +1,10 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkGeneratorConfigCommon, VovkReadmeConfig, VovkSnippetsConfig, VovkSchema } from '../types';
+import type { VovkGeneratorConfigCommon, VovkReadmeConfig, VovkSnippetsConfig, VovkSchema, VovkGeneratorConfigStrict } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function getGeneratorConfig({ schema, config, segmentName, isBundle, }: {
     schema: VovkSchema;
     config?: VovkGeneratorConfigCommon;
-    segmentName?: string;
+    segmentName: string | null;
     isBundle?: boolean;
 }): {
     readme: VovkReadmeConfig;
@@ -12,4 +12,5 @@ export declare function getGeneratorConfig({ schema, config, segmentName, isBund
     snippets: VovkSnippetsConfig;
     origin: string;
     package: PackageJson;
+    imports: VovkGeneratorConfigStrict['imports'];
 };

package/mjs/utils/getGeneratorConfig.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGeneratorConfig = getGeneratorConfig;
 const deepExtend_1 = __importDefault(require("./deepExtend"));
 function getGeneratorConfig({ schema, config, segmentName, isBundle, }) {
-    const packageJson = (0, deepExtend_1.default)({}, schema.meta?.package, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, segmentName ? schema.segments?.[segmentName]?.meta?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.package : undefined, config?.package);
+    const packageJson = (0, deepExtend_1.default)({}, schema.meta?.package, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, segmentName ? schema.segments?.[segmentName]?.meta?.package : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package : undefined, config?.package);
     return {
         package: packageJson,
         openAPIObject: (0, deepExtend_1.default)({}, {
@@ -16,12 +16,17 @@ function getGeneratorConfig({ schema, config, segmentName, isBundle, }) {
                 description: packageJson.description,
             },
         }, schema.meta?.config?.generatorConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.openAPIObject : undefined, segmentName ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIObject : undefined, config?.openAPIObject),
-        snippets: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.snippets, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.snippets : undefined, config?.snippets),
-        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIMixin?.readme : undefined, config?.readme),
+        snippets: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.snippets, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.snippets : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.snippets : undefined, config?.snippets),
+        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme : undefined, config?.readme),
         origin: config?.origin ||
             schema.meta?.config?.generatorConfig?.origin ||
             (segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.origin : undefined) ||
             (isBundle ? schema.meta?.config?.bundle?.generatorConfig?.origin : undefined) ||
             '',
+        imports: (0, deepExtend_1.default)({
+            fetcher: ['vovk'],
+            validateOnClient: null,
+            createRPC: ['vovk'],
+        }, schema.meta?.config?.generatorConfig?.imports, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.imports : undefined, segmentName ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.imports : undefined, config?.imports),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.404",
+  "version": "3.0.0-draft.405",
   "main": "./cjs/index.js",
   "module": "./mjs/index.js",
   "types": "./mjs/index.d.ts",