vovk 3.0.0-draft.469 → 3.0.0-draft.471

package/README.md

@@ -7,7 +7,7 @@
     </picture>
   </a>
   <br>
-  <strong>Back-end for <a href="https://nextjs.org/">Next.js</a></strong>
+  <strong>Back-end for Next.js</strong>
 </p>
 
 ---
@@ -19,4 +19,3 @@ The main library with [100% self-composition](https://bundlephobia.com/result?p=
 ```sh
 npm install vovk
 ```
-

package/cjs/VovkApp.js

@@ -226,7 +226,7 @@ class VovkApp {
             return this.#respondWithError({
                 req,
                 statusCode: types_1.HttpStatus.NOT_FOUND,
-                message: `${Object.keys(handlers)} - Route ${path.join('/')} is not found`,
+                message: `Route ${path.join('/')} is not found`,
             });
         }
         const { staticMethod, controller } = handler;

package/cjs/openapi/vovkSchemaToOpenAPI.js

@@ -50,7 +50,6 @@ function vovkSchemaToOpenAPI({ config, rootEntry = 'api', schema: fullSchema, ou
     const components = {};
     const { openAPIObject, samples: samplesConfig, package: packageJson, readme: readmeConfig, origin, imports, reExports, } = (0, resolveGeneratorConfigValues_1.resolveGeneratorConfigValues)({
         config,
-        schema: fullSchema,
         outputConfigs,
         isBundle,
         segmentName: givenSegmentName ?? null,

package/cjs/types.d.ts

@@ -328,18 +328,19 @@ export type VovkSamplesConfig = {
     apiRoot?: string;
     headers?: Record<string, string>;
 };
-type ClientConfigCommon = {
-    enabled?: boolean;
-    outDir?: string;
-    fromTemplates?: string[];
-    prettifyClient?: boolean;
-} & ({
+type IncludeExcludeSegments = {
     excludeSegments?: never;
     includeSegments?: string[];
 } | {
     excludeSegments?: string[];
     includeSegments?: never;
-});
+};
+type ClientConfigCommon = {
+    enabled?: boolean;
+    outDir?: string;
+    fromTemplates?: string[];
+    prettifyClient?: boolean;
+} & IncludeExcludeSegments;
 type ClientConfigComposed = ClientConfigCommon;
 type ClientConfigSegmented = ClientConfigCommon;
 type BundleConfig = {
@@ -353,13 +354,7 @@ type BundleConfig = {
         entry: string;
     }) => Promise<void>;
     outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
-} & ({
-    excludeSegments?: never;
-    includeSegments?: string[];
-} | {
-    excludeSegments?: string[];
-    includeSegments?: never;
-});
+} & IncludeExcludeSegments;
 type GeneratorConfigImports = {
     fetcher?: string | [string, string] | [string];
     validateOnClient?: string | [string, string] | [string] | null;
@@ -423,13 +418,13 @@ export interface VovkSegmentConfig extends VovkOutputConfig<SegmentConfigImports
 }
 type VovkUserConfig = {
     $schema?: typeof VovkSchemaIdEnum.CONFIG | (string & {});
-    emitConfig?: boolean | (keyof VovkStrictConfig | (string & {}))[];
+    exposeConfigKeys?: boolean | (keyof VovkStrictConfig | (string & {}))[];
     schemaOutDir?: string;
     modulesDir?: string;
     rootEntry?: string;
     logLevel?: 'error' | 'trace' | 'debug' | 'info' | 'warn' | (string & {});
     libs?: {
-        ajv: KnownAny;
+        ajv?: KnownAny;
         [key: string]: KnownAny;
     };
     devHttps?: boolean;
@@ -448,9 +443,9 @@ type VovkUserConfig = {
     };
 };
 export type VovkConfig = VovkUserConfig;
-export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'libs' | 'composedClient' | 'segmentedClient' | 'bundle'>> & {
-    emitConfig: (keyof VovkStrictConfig | string)[];
-    bundle: RequireAllExcept<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>;
+export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'exposeConfigKeys' | 'libs' | 'composedClient' | 'segmentedClient' | 'bundle'>> & {
+    exposeConfigKeys: (keyof VovkStrictConfig | string)[];
+    bundle: Required<Omit<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>> & IncludeExcludeSegments;
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
@@ -461,7 +456,6 @@ export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'lib
     };
 };
 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>;
 export type IsEmptyObject<T> = T extends object ? keyof T extends never ? true : T extends Partial<T> ? Partial<T> extends T ? true : false : false : false;
 export type Prettify<T> = {
     [K in keyof T]: T[K];

package/cjs/utils/createStandardValidation.js

@@ -23,7 +23,7 @@ function createStandardValidation({ toJSONSchema, }) {
                 if (result.issues?.length) {
                     throw new HttpException_1.HttpException(types_1.HttpStatus.BAD_REQUEST, `Validation failed. Invalid ${type === 'iteration' ? `${type} #${i}` : type} on server: ${result.issues
                         .map(({ message, path }) => `${message}${path ? ` at ${path.join('.')}` : ''}`)
-                        .join(', ')}`, { [type]: data, result });
+                        .join(', ')}`, { issues: result.issues });
                 }
                 return result.value;
             },

package/cjs/utils/resolveGeneratorConfigValues.d.ts

@@ -1,9 +1,8 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkOutputConfig, VovkPackageJson, VovkReadmeConfig, VovkSamplesConfig, VovkSchema, VovkStrictConfig } from '../types';
+import type { VovkConfig, VovkOutputConfig, VovkPackageJson, VovkReadmeConfig, VovkSamplesConfig } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
-export declare function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentName, isBundle, projectPackageJson, }: {
-    config: VovkStrictConfig | undefined;
-    schema: VovkSchema;
+export declare function resolveGeneratorConfigValues({ config, outputConfigs, segmentName, isBundle, projectPackageJson, }: {
+    config: VovkConfig | undefined;
     outputConfigs: VovkOutputConfig[];
     segmentName: string | null;
     isBundle: boolean;

package/cjs/utils/resolveGeneratorConfigValues.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveGeneratorConfigValues = resolveGeneratorConfigValues;
 const deepExtend_1 = __importDefault(require("./deepExtend"));
-function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentName, isBundle, projectPackageJson, }) {
+function resolveGeneratorConfigValues({ config, outputConfigs, segmentName, isBundle, projectPackageJson, }) {
     const packageJson = (0, deepExtend_1.default)({}, {
         main: './index.cjs',
         module: './index.mjs',
@@ -17,7 +17,7 @@ function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentNa
                 types: './index.d.mts',
             },
         },
-    }, Object.fromEntries(Object.entries(projectPackageJson ?? {}).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))), config?.outputConfig?.package, isBundle ? config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.package : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
+    }, Object.fromEntries(Object.entries(projectPackageJson ?? {}).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))), config?.outputConfig?.package, isBundle ? config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.package : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
     return {
         package: packageJson,
         openAPIObject: (0, deepExtend_1.default)({}, {
@@ -27,7 +27,7 @@ function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentNa
                 version: packageJson.version,
                 description: packageJson.description,
             },
-        }, config?.outputConfig?.openAPIObject, isBundle ? config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.openAPIObject : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
+        }, config?.outputConfig?.openAPIObject, isBundle ? config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.openAPIObject : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
         samples: (0, deepExtend_1.default)({}, config?.outputConfig?.samples, isBundle ? config?.bundle?.outputConfig?.samples : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.samples : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.samples), {})),
         readme: (0, deepExtend_1.default)({}, config?.outputConfig?.readme, isBundle ? config?.bundle?.outputConfig?.readme : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.readme : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.readme), {})),
         origin: [

package/mjs/VovkApp.js

@@ -226,7 +226,7 @@ class VovkApp {
             return this.#respondWithError({
                 req,
                 statusCode: types_1.HttpStatus.NOT_FOUND,
-                message: `${Object.keys(handlers)} - Route ${path.join('/')} is not found`,
+                message: `Route ${path.join('/')} is not found`,
             });
         }
         const { staticMethod, controller } = handler;

package/mjs/openapi/vovkSchemaToOpenAPI.js

@@ -50,7 +50,6 @@ function vovkSchemaToOpenAPI({ config, rootEntry = 'api', schema: fullSchema, ou
     const components = {};
     const { openAPIObject, samples: samplesConfig, package: packageJson, readme: readmeConfig, origin, imports, reExports, } = (0, resolveGeneratorConfigValues_1.resolveGeneratorConfigValues)({
         config,
-        schema: fullSchema,
         outputConfigs,
         isBundle,
         segmentName: givenSegmentName ?? null,

package/mjs/types.d.ts

@@ -328,18 +328,19 @@ export type VovkSamplesConfig = {
     apiRoot?: string;
     headers?: Record<string, string>;
 };
-type ClientConfigCommon = {
-    enabled?: boolean;
-    outDir?: string;
-    fromTemplates?: string[];
-    prettifyClient?: boolean;
-} & ({
+type IncludeExcludeSegments = {
     excludeSegments?: never;
     includeSegments?: string[];
 } | {
     excludeSegments?: string[];
     includeSegments?: never;
-});
+};
+type ClientConfigCommon = {
+    enabled?: boolean;
+    outDir?: string;
+    fromTemplates?: string[];
+    prettifyClient?: boolean;
+} & IncludeExcludeSegments;
 type ClientConfigComposed = ClientConfigCommon;
 type ClientConfigSegmented = ClientConfigCommon;
 type BundleConfig = {
@@ -353,13 +354,7 @@ type BundleConfig = {
         entry: string;
     }) => Promise<void>;
     outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
-} & ({
-    excludeSegments?: never;
-    includeSegments?: string[];
-} | {
-    excludeSegments?: string[];
-    includeSegments?: never;
-});
+} & IncludeExcludeSegments;
 type GeneratorConfigImports = {
     fetcher?: string | [string, string] | [string];
     validateOnClient?: string | [string, string] | [string] | null;
@@ -423,13 +418,13 @@ export interface VovkSegmentConfig extends VovkOutputConfig<SegmentConfigImports
 }
 type VovkUserConfig = {
     $schema?: typeof VovkSchemaIdEnum.CONFIG | (string & {});
-    emitConfig?: boolean | (keyof VovkStrictConfig | (string & {}))[];
+    exposeConfigKeys?: boolean | (keyof VovkStrictConfig | (string & {}))[];
     schemaOutDir?: string;
     modulesDir?: string;
     rootEntry?: string;
     logLevel?: 'error' | 'trace' | 'debug' | 'info' | 'warn' | (string & {});
     libs?: {
-        ajv: KnownAny;
+        ajv?: KnownAny;
         [key: string]: KnownAny;
     };
     devHttps?: boolean;
@@ -448,9 +443,9 @@ type VovkUserConfig = {
     };
 };
 export type VovkConfig = VovkUserConfig;
-export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'libs' | 'composedClient' | 'segmentedClient' | 'bundle'>> & {
-    emitConfig: (keyof VovkStrictConfig | string)[];
-    bundle: RequireAllExcept<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>;
+export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'exposeConfigKeys' | 'libs' | 'composedClient' | 'segmentedClient' | 'bundle'>> & {
+    exposeConfigKeys: (keyof VovkStrictConfig | string)[];
+    bundle: Required<Omit<NonNullable<VovkUserConfig['bundle']>, 'includeSegments' | 'excludeSegments'>> & IncludeExcludeSegments;
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
@@ -461,7 +456,6 @@ export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'lib
     };
 };
 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>;
 export type IsEmptyObject<T> = T extends object ? keyof T extends never ? true : T extends Partial<T> ? Partial<T> extends T ? true : false : false : false;
 export type Prettify<T> = {
     [K in keyof T]: T[K];

package/mjs/utils/createStandardValidation.js

@@ -23,7 +23,7 @@ function createStandardValidation({ toJSONSchema, }) {
                 if (result.issues?.length) {
                     throw new HttpException_1.HttpException(types_1.HttpStatus.BAD_REQUEST, `Validation failed. Invalid ${type === 'iteration' ? `${type} #${i}` : type} on server: ${result.issues
                         .map(({ message, path }) => `${message}${path ? ` at ${path.join('.')}` : ''}`)
-                        .join(', ')}`, { [type]: data, result });
+                        .join(', ')}`, { issues: result.issues });
                 }
                 return result.value;
             },

package/mjs/utils/resolveGeneratorConfigValues.d.ts

@@ -1,9 +1,8 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkOutputConfig, VovkPackageJson, VovkReadmeConfig, VovkSamplesConfig, VovkSchema, VovkStrictConfig } from '../types';
+import type { VovkConfig, VovkOutputConfig, VovkPackageJson, VovkReadmeConfig, VovkSamplesConfig } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
-export declare function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentName, isBundle, projectPackageJson, }: {
-    config: VovkStrictConfig | undefined;
-    schema: VovkSchema;
+export declare function resolveGeneratorConfigValues({ config, outputConfigs, segmentName, isBundle, projectPackageJson, }: {
+    config: VovkConfig | undefined;
     outputConfigs: VovkOutputConfig[];
     segmentName: string | null;
     isBundle: boolean;

package/mjs/utils/resolveGeneratorConfigValues.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveGeneratorConfigValues = resolveGeneratorConfigValues;
 const deepExtend_1 = __importDefault(require("./deepExtend"));
-function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentName, isBundle, projectPackageJson, }) {
+function resolveGeneratorConfigValues({ config, outputConfigs, segmentName, isBundle, projectPackageJson, }) {
     const packageJson = (0, deepExtend_1.default)({}, {
         main: './index.cjs',
         module: './index.mjs',
@@ -17,7 +17,7 @@ function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentNa
                 types: './index.d.mts',
             },
         },
-    }, Object.fromEntries(Object.entries(projectPackageJson ?? {}).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))), config?.outputConfig?.package, isBundle ? config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.package : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
+    }, Object.fromEntries(Object.entries(projectPackageJson ?? {}).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))), config?.outputConfig?.package, isBundle ? config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.package : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
     return {
         package: packageJson,
         openAPIObject: (0, deepExtend_1.default)({}, {
@@ -27,7 +27,7 @@ function resolveGeneratorConfigValues({ config, schema, outputConfigs, segmentNa
                 version: packageJson.version,
                 description: packageJson.description,
             },
-        }, config?.outputConfig?.openAPIObject, isBundle ? config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.openAPIObject : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
+        }, config?.outputConfig?.openAPIObject, isBundle ? config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.openAPIObject : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
         samples: (0, deepExtend_1.default)({}, config?.outputConfig?.samples, isBundle ? config?.bundle?.outputConfig?.samples : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.samples : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.samples), {})),
         readme: (0, deepExtend_1.default)({}, config?.outputConfig?.readme, isBundle ? config?.bundle?.outputConfig?.readme : undefined, typeof segmentName === 'string' ? config?.outputConfig?.segments?.[segmentName]?.readme : undefined, outputConfigs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.readme), {})),
         origin: [

package/package.json

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