vovk 3.7.0 → 4.0.0-beta.0

package/dist/validation/create-standard-validation.d.ts

@@ -1,8 +1,8 @@
-import type { VovkRequest } from '../types/request.js';
-import type { BodyTypeFromContentType, CombinedSpec, ContentType, NormalizeContentType } from '../types/validation.js';
 import type { VovkValidationType } from '../types/core.js';
 import type { VovkOperationObject } from '../types/operation.js';
+import type { VovkRequest } from '../types/request.js';
 import type { KnownAny } from '../types/utils.js';
+import type { BodyTypeFromContentType, CombinedSpec, ContentType, NormalizeContentType } from '../types/validation.js';
 type ProcedureOptions<TBody extends CombinedSpec, TQuery extends CombinedSpec, TParams extends CombinedSpec, TOutput extends CombinedSpec, TIteration extends CombinedSpec, TContentType extends ContentType | ContentType[]> = {
     contentType?: TContentType;
     body?: TBody;
@@ -22,7 +22,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
         validationType: VovkValidationType;
         target: CombinedSpec.Target | undefined;
     }) => KnownAny;
-}): (<TBody extends CombinedSpec, TQuery extends CombinedSpec, TParams extends CombinedSpec, TOutput extends CombinedSpec, TIteration extends CombinedSpec, TReq extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TBody> : undefined, TQuery extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TQuery> : undefined, TParams extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TParams> : undefined>, TContentType extends ContentType | ContentType[] = ["application/json"]>(options?: ProcedureOptions<TBody, TQuery, TParams, TOutput, TIteration, TContentType>) => {
+}): <TBody extends CombinedSpec, TQuery extends CombinedSpec, TParams extends CombinedSpec, TOutput extends CombinedSpec, TIteration extends CombinedSpec, TReq extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TBody> : undefined, TQuery extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TQuery> : undefined, TParams extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TParams> : undefined>, TContentType extends ContentType | ContentType[] = ["application/json"]>(options?: ProcedureOptions<TBody, TQuery, TParams, TOutput, TIteration, TContentType>) => {
     (req: TReq, params: TParams extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TParams> : Record<string, string>): KnownAny;
     __types: {
         body: TBody extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TBody> : any;
@@ -141,128 +141,5 @@ export declare function createStandardValidation({ toJSONSchema, }: {
         schema: KnownAny;
         wrapper?: KnownAny;
     };
-}) & {
-    createTool: {
-        <TInput, TOutput, TToModelOutput extends (...args: KnownAny[]) => KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TInput, TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TInput, TOutput, TToModelOutput extends (...args: KnownAny[]) => KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TInput, TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: TInput, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TOutput, TToModelOutput extends (...args: KnownAny[]) => KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TOutput, TToModelOutput extends (...args: KnownAny[]) => KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: null, processingMeta?: KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-    };
 };
 export {};

package/dist/validation/create-standard-validation.js

@@ -1,7 +1,6 @@
-import { withValidationLibrary } from './with-validation-library.js';
 import { HttpException } from '../core/http-exception.js';
-import { createToolFactory } from '../tools/create-tool-factory.js';
 import { HttpStatus } from './create-validate-on-client.js';
+import { withValidationLibrary } from './with-validation-library.js';
 export function createStandardValidation({ toJSONSchema, }) {
     function callWithValidationLibrary(options, handle) {
         const normalizedContentType = (typeof options.contentType === 'string' ? [options.contentType] : options.contentType);
@@ -41,5 +40,5 @@ export function createStandardValidation({ toJSONSchema, }) {
             },
         });
     }
-    return Object.assign(procedure, { createTool: createToolFactory({ toJSONSchema }) });
+    return procedure;
 }

package/dist/validation/create-validate-on-client.d.ts

@@ -1,9 +1,9 @@
 import { HttpException } from '../core/http-exception.js';
+import type { VovkSchema } from '../types/core.js';
 import { HttpStatus } from '../types/enums.js';
-import type { VovkValidateOnClient } from '../types/validation.js';
 import type { VovkJSONSchemaBase } from '../types/json-schema.js';
-import type { VovkSchema } from '../types/core.js';
-export { createValidateOnClient, HttpException, HttpStatus, type VovkJSONSchemaBase, type VovkValidateOnClient, type VovkSchema, };
+import type { VovkValidateOnClient } from '../types/validation.js';
+export { createValidateOnClient, HttpException, HttpStatus, type VovkJSONSchemaBase, type VovkSchema, type VovkValidateOnClient, };
 /**
  * Creates a validation function for client-side input validation.
  */

package/dist/validation/json-schema-only-spec.d.ts

@@ -0,0 +1,14 @@
+import type { VovkJSONSchemaBase } from '../types/json-schema.js';
+import type { CombinedSpec } from '../types/validation.js';
+type JSONSchemasObject = {
+    body?: VovkJSONSchemaBase;
+    query?: VovkJSONSchemaBase;
+    params?: VovkJSONSchemaBase;
+};
+export declare function jsonSchemaToJSONSchemaOnlySpec({ jsonSchema }: {
+    jsonSchema: VovkJSONSchemaBase;
+}): CombinedSpec;
+export declare function jsonSchemasObjectToSingleJSONSchemaOnlySpec({ schemas, }: {
+    schemas: JSONSchemasObject;
+}): CombinedSpec | undefined;
+export {};

package/dist/validation/json-schema-only-spec.js

@@ -0,0 +1,57 @@
+const SLOT_KEYS = ['body', 'query', 'params'];
+function makeSpec(jsonSchema, validate) {
+    return {
+        '~standard': {
+            version: 1,
+            vendor: 'vovk',
+            validate,
+            jsonSchema: {
+                input: () => jsonSchema,
+                output: () => jsonSchema,
+            },
+        },
+    };
+}
+// CombinedSpec from a plain JSON Schema: jsonSchema.input/output return it as is, validate always
+// passes since the real validation happens during tool execution, not here
+export function jsonSchemaToJSONSchemaOnlySpec({ jsonSchema }) {
+    return makeSpec(jsonSchema, (value) => ({ value }));
+}
+// Same, but combines body/query/params into one object schema (same envelope as
+// validationSchemasObjectToSingleValidationSchema); validate checks the envelope only
+// (object shape, required slots, unknown keys) and lets slot contents pass
+export function jsonSchemasObjectToSingleJSONSchemaOnlySpec({ schemas, }) {
+    const definedEntries = SLOT_KEYS.flatMap((key) => {
+        const schema = schemas[key];
+        return schema ? [[key, schema]] : [];
+    });
+    if (definedEntries.length === 0) {
+        return undefined;
+    }
+    const definedSlots = definedEntries.map(([key]) => key);
+    const definedSlotSet = new Set(definedSlots);
+    const validate = (input) => {
+        if (typeof input !== 'object' || input === null || Array.isArray(input)) {
+            return { issues: [{ message: 'Expected object', path: [] }] };
+        }
+        const issues = [];
+        const inputRecord = input;
+        for (const slot of definedSlots) {
+            if (!(slot in inputRecord)) {
+                issues.push({ message: 'Required', path: [{ key: slot }] });
+            }
+        }
+        for (const key of Object.keys(inputRecord)) {
+            if (!definedSlotSet.has(key)) {
+                issues.push({ message: 'Unexpected key', path: [{ key }] });
+            }
+        }
+        return issues.length > 0 ? { issues } : { value: input };
+    };
+    return makeSpec({
+        type: 'object',
+        properties: Object.fromEntries(definedEntries),
+        required: definedSlots,
+        additionalProperties: false,
+    }, validate);
+}

package/dist/validation/procedure.d.ts

@@ -3,7 +3,7 @@ import type { CombinedSpec } from '../types/validation.js';
  * Procedure function for defining validation schemas for API procedures.
  * @see https://vovk.dev/procedure
  */
-export declare const procedure: (<TBody extends CombinedSpec, TQuery extends CombinedSpec, TParams extends CombinedSpec, TOutput extends CombinedSpec, TIteration extends CombinedSpec, TReq extends import("../index.js").VovkRequest<import("../types/utils.js").KnownAny, import("../types/utils.js").KnownAny, import("../types/utils.js").KnownAny> = import("../index.js").VovkRequest<TBody extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TBody> : undefined, TQuery extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TQuery> : undefined, TParams extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TParams> : undefined>, TContentType extends import("../types/validation.js").ContentType | import("../types/validation.js").ContentType[] = ["application/json"]>(options?: {
+export declare const procedure: <TBody extends CombinedSpec, TQuery extends CombinedSpec, TParams extends CombinedSpec, TOutput extends CombinedSpec, TIteration extends CombinedSpec, TReq extends import("../index.js").VovkRequest<import("../types/utils.js").KnownAny, import("../types/utils.js").KnownAny, import("../types/utils.js").KnownAny> = import("../index.js").VovkRequest<TBody extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TBody> : undefined, TQuery extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TQuery> : undefined, TParams extends CombinedSpec<unknown, unknown> ? CombinedSpec.InferOutput<TParams> : undefined>, TContentType extends import("../types/validation.js").ContentType | import("../types/validation.js").ContentType[] = ["application/json"]>(options?: {
     contentType?: TContentType | undefined;
     body?: TBody | undefined;
     query?: TQuery | undefined;
@@ -135,127 +135,4 @@ export declare const procedure: (<TBody extends CombinedSpec, TQuery extends Com
         schema: import("../types/utils.js").KnownAny;
         wrapper?: import("../types/utils.js").KnownAny;
     };
-}) & {
-    createTool: {
-        <TInput, TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TInput, TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TInput, TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<TInput, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TInput, TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema: CombinedSpec<TInput, TInput>;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: TInput, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<TInput, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema: CombinedSpec<TOutput, TOutput>;
-        } & {
-            execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-        <TOutput, TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => import("../types/utils.js").KnownAny>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput: TToModelOutput;
-        }): import("../index.js").VovkTool<null, TOutput, TToModelOutput extends import("../tools/to-model-output-default.js").ToModelOutputDefaultFn ? import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput> : TToModelOutput extends (...args: import("../types/utils.js").KnownAny[]) => infer R ? R extends Promise<infer U> ? U : R : unknown>;
-        <TOutput>(options: {
-            name: string;
-            title?: string;
-            description: string;
-            onExecute?: ((result: unknown, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            onError?: ((error: Error, tool: import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>) => void) | undefined;
-            target?: CombinedSpec.Target;
-        } & {
-            inputSchema?: undefined;
-        } & {
-            outputSchema?: undefined;
-        } & {
-            execute: (input: null, processingMeta?: import("../types/utils.js").KnownAny) => TOutput | Promise<TOutput>;
-            toModelOutput?: undefined;
-        }): import("../index.js").VovkTool<null, TOutput, import("../tools/to-model-output-default.js").DefaultModelOutput<TOutput>>;
-    };
 };

package/dist/validation/validation-schemas-object-to-single-validation-schema.d.ts

@@ -4,14 +4,5 @@ type SchemasObject = {
     query?: CombinedSpec;
     params?: CombinedSpec;
 };
-/**
- * Combine optional `body` / `query` / `params` Standard Schemas into a single
- * `CombinedSpec` whose `~standard` interface fully conforms to Standard Schema
- * + Standard JSON Schema. Top-level validation (object shape, key presence,
- * rejection of unknown keys) is handled here; per-slot value validation and
- * JSON Schema conversion are delegated to the slot schemas.
- *
- * Internal helper. Not exported from the public `vovk` entrypoint.
- */
 export declare function validationSchemasObjectToSingleValidationSchema<TSchemas extends SchemasObject>(schemas: TSchemas): CombinedSpec & TSchemas;
 export {};

package/dist/validation/validation-schemas-object-to-single-validation-schema.js

@@ -8,17 +8,14 @@ function prefixIssues(issues, slot) {
         path: [{ key: slot }, ...(issue.path ?? [])],
     }));
 }
-/**
- * Combine optional `body` / `query` / `params` Standard Schemas into a single
- * `CombinedSpec` whose `~standard` interface fully conforms to Standard Schema
- * + Standard JSON Schema. Top-level validation (object shape, key presence,
- * rejection of unknown keys) is handled here; per-slot value validation and
- * JSON Schema conversion are delegated to the slot schemas.
- *
- * Internal helper. Not exported from the public `vovk` entrypoint.
- */
+// combines body/query/params Standard Schemas into a single CombinedSpec; top level object
+// shape is validated here, per slot validation and JSON Schema are delegated to slot schemas
 export function validationSchemasObjectToSingleValidationSchema(schemas) {
-    const definedSlots = SLOT_KEYS.filter((key) => schemas[key] !== undefined);
+    const definedEntries = SLOT_KEYS.flatMap((key) => {
+        const schema = schemas[key];
+        return schema ? [[key, schema]] : [];
+    });
+    const definedSlots = definedEntries.map(([key]) => key);
     const definedSlotSet = new Set(definedSlots);
     const validate = (input) => {
         if (typeof input !== 'object' || input === null || Array.isArray(input)) {
@@ -37,9 +34,9 @@ export function validationSchemasObjectToSingleValidationSchema(schemas) {
             }
         }
         const pending = [];
-        for (const slot of definedSlots) {
+        for (const [slot, schema] of definedEntries) {
             if (slot in inputRecord) {
-                pending.push({ slot, result: schemas[slot]['~standard'].validate(inputRecord[slot]) });
+                pending.push({ slot, result: schema['~standard'].validate(inputRecord[slot]) });
             }
         }
         const combine = (resolved) => {
@@ -62,8 +59,8 @@ export function validationSchemasObjectToSingleValidationSchema(schemas) {
     };
     const buildJSONSchema = (options, direction) => {
         const properties = {};
-        for (const slot of definedSlots) {
-            properties[slot] = schemas[slot]['~standard'].jsonSchema?.[direction](options) ?? {};
+        for (const [slot, schema] of definedEntries) {
+            properties[slot] = schema['~standard'].jsonSchema?.[direction](options) ?? {};
         }
         return {
             type: 'object',

package/dist/validation/with-validation-library.d.ts

@@ -1,8 +1,8 @@
 import type { VovkHandlerSchema, VovkValidationType } from '../types/core.js';
-import type { VovkRequest } from '../types/request.js';
-import type { BodyTypeFromContentType, ContentType, VovkTypedProcedure } from '../types/validation.js';
 import type { VovkOperationObject } from '../types/operation.js';
+import type { VovkRequest } from '../types/request.js';
 import type { KnownAny } from '../types/utils.js';
+import type { BodyTypeFromContentType, ContentType, VovkTypedProcedure } from '../types/validation.js';
 type VovkRequestAny = VovkRequest<KnownAny, KnownAny, KnownAny>;
 type Meta = {
     __disableClientValidation?: boolean;

package/dist/validation/with-validation-library.js

@@ -1,11 +1,11 @@
 import { HttpException } from '../core/http-exception.js';
-import { reqMeta } from '../req/req-meta.js';
-import { setHandlerSchema } from '../core/set-handler-schema.js';
 import { JSONLinesResponder } from '../core/json-lines-responder.js';
-import { HttpStatus } from '../types/enums.js';
-import { validateContentType } from '../req/validate-content-type.js';
+import { setHandlerSchema } from '../core/set-handler-schema.js';
 import { bufferBody } from '../req/buffer-body.js';
 import { parseForm } from '../req/parse-form.js';
+import { reqMeta } from '../req/req-meta.js';
+import { validateContentType } from '../req/validate-content-type.js';
+import { HttpStatus } from '../types/enums.js';
 const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
 export function withValidationLibrary({ contentType, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }) {
     preferTransformed = preferTransformed ?? true;
@@ -25,7 +25,8 @@ export function withValidationLibrary({ contentType, disableServerSideValidation
             throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR, "Output and iteration are mutually exclusive. You can't use them together.");
         }
         if (output && !disableServerSideValidationKeys.includes('output')) {
-            if (!data) {
+            // only undefined means a missing return, falsy values like false or 0 are valid outputs
+            if (data === undefined) {
                 throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
             }
             const parsed = (await validate(data, output, { validationType: 'output', req })) ?? data;
@@ -73,6 +74,11 @@ export function withValidationLibrary({ contentType, disableServerSideValidation
     const resultHandler = (async (req, handlerParams) => {
         const { __disableClientValidation } = req.vovk.meta();
         if (!__disableClientValidation) {
+            // a declared contentType is enforced even with no body schema to validate against,
+            // disabling body validation still opts out of it, same as in the body branch below
+            if (contentType && !body && !disableServerSideValidationKeys.includes('body')) {
+                validateContentType(req, contentType);
+            }
             if (body && !disableServerSideValidationKeys.includes('body')) {
                 if (typeof req.url === 'string')
                     await bufferBody(req); // buffer the body to make it replayable for validation and actual parsing

package/package.json

@@ -3,11 +3,12 @@
   "type": "module",
   "files": [
     "dist",
-    "bin"
+    "bin",
+    "CHANGELOG.md"
   ],
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "version": "3.7.0",
+  "version": "4.0.0-beta.0",
   "bin": {
     "vovk-cli-npx": "./bin/index.mjs"
   },
@@ -31,14 +32,6 @@
     "./create-validate-on-client": {
       "types": "./dist/validation/create-validate-on-client.d.ts",
       "default": "./dist/validation/create-validate-on-client.js"
-    },
-    "./createRPC": {
-      "types": "./dist/client/create-rpc.d.ts",
-      "default": "./dist/client/create-rpc.js"
-    },
-    "./createValidateOnClient": {
-      "types": "./dist/validation/create-validate-on-client.d.ts",
-      "default": "./dist/validation/create-validate-on-client.js"
     }
   },
   "description": "Back-end Framework for Next.js App Router",