vovk 3.0.0-draft.113 → 3.0.0-draft.115

package/dist/VovkApp.js

@@ -136,6 +136,7 @@ class VovkApp {
             params: () => methodParams,
         };
         try {
+            await staticMethod._options?.before?.call(controller, req);
             const result = await staticMethod.call(controller, req, methodParams);
             const isIterator = typeof result === 'object' &&
                 !!result &&

package/dist/client/types.d.ts

@@ -82,7 +82,6 @@ export type VovkClientFetcher<OPTS extends Record<string, KnownAny> = Record<str
 } & OPTS) => KnownAny;
 export interface VovkDefaultFetcherOptions {
     apiRoot?: string;
-    segmentName?: string;
     disableClientValidation?: boolean;
     validateOnClient?: VovkValidateOnClient;
     fetcher?: VovkClientFetcher;
@@ -98,7 +97,7 @@ export type VovkValidateOnClient = (input: {
     query?: unknown;
     params?: unknown;
     endpoint: string;
-}, validation: Exclude<VovkHandlerSchema['validation'], undefined>, fullSchema: VovkFullSchema) => void | Promise<void>;
+}, validation: Omit<Exclude<VovkHandlerSchema['validation'], undefined>, 'output' | 'iteration'>, fullSchema: VovkFullSchema) => void | Promise<void>;
 export type VovkClientOptions<OPTS extends Record<string, KnownAny> = Record<string, never>> = {
     fetcher?: VovkClientFetcher<OPTS>;
     validateOnClient?: VovkValidateOnClient;

package/dist/types.d.ts

@@ -47,6 +47,7 @@ export type VovkController = StaticClass & VovkControllerInternal & {
 export type DecoratorOptions = {
     cors?: boolean;
     headers?: Record<string, string>;
+    before?: (this: VovkController, req: VovkRequest) => unknown;
 };
 export type RouteHandler = ((req: VovkRequest, params: Record<string, string>) => Response | Promise<Response> | Iterable<unknown> | AsyncIterable<unknown>) & {
     _options?: DecoratorOptions;
@@ -98,8 +99,8 @@ export type StreamAbortMessage = {
 type LogLevelNames = 'trace' | 'debug' | 'info' | 'warn' | 'error';
 export type VovkEnv = {
     PORT?: string;
-    VOVK_EMIT_FULL_CLIENT?: string;
-    VOVK_EMIT_SEGMENT_CLIENT?: string;
+    VOVK_GENERATE_FULL_CLIENT?: string;
+    VOVK_GENERATE_SEGMENT_CLIENT?: string;
     VOVK_CLIENT_OUT_DIR?: string;
     VOVK_SCHEMA_OUT_DIR?: string;
     VOVK_IMPORTS_FETCHER?: string;
@@ -128,8 +129,8 @@ export type VovkConfig = {
     emitConfig?: boolean | (keyof VovkStrictConfig)[];
     clientOutDir?: string;
     schemaOutDir?: string;
-    emitFullClient?: boolean;
-    emitSegmentClient?: boolean;
+    generateFullClient?: boolean;
+    generateSegmentClient?: boolean;
     imports?: {
         fetcher?: string | [string, string] | [string];
         validateOnClient?: string | [string, string] | [string];

package/dist/utils/reqForm.js

@@ -7,7 +7,26 @@ async function reqForm(req) {
         return formMap.get(req);
     }
     const body = await req.formData();
-    const formData = Object.fromEntries(body.entries());
+    const formData = {};
+    for (const [key, value] of body.entries()) {
+        if (value instanceof File) {
+            // If this key already exists, convert to array or append to existing array
+            if (formData[key]) {
+                if (Array.isArray(formData[key])) {
+                    formData[key].push(value);
+                }
+                else {
+                    formData[key] = [formData[key], value];
+                }
+            }
+            else {
+                formData[key] = value;
+            }
+        }
+        else {
+            formData[key] = value.toString();
+        }
+    }
     formMap.set(req, formData);
     return formData;
 }

package/dist/utils/withValidation.d.ts

@@ -1,5 +1,5 @@
-import { VovkHandlerSchema, VovkValidationType, type KnownAny, type VovkRequest } from '../types';
-export declare function withValidation<T extends (req: KnownAny, params: KnownAny) => KnownAny, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getHandlerSchema, validate, }: {
+import { VovkValidationType, type KnownAny, type VovkRequest } from '../types';
+export declare function withValidation<T extends (req: KnownAny, params: KnownAny) => KnownAny, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ disableServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }: {
     disableServerSideValidation?: boolean | VovkValidationType[];
     skipSchemaEmission?: boolean | VovkValidationType[];
     validateEveryIteration?: boolean;
@@ -9,9 +9,9 @@ export declare function withValidation<T extends (req: KnownAny, params: KnownAn
     output?: OUTPUT_MODEL;
     iteration?: ITERATION_MODEL;
     handle: T;
-    getHandlerSchema?: (options: {
-        skipSchemaEmissionKeys: VovkValidationType[];
-    }) => Omit<VovkHandlerSchema, 'httpMethod' | 'path'>;
+    getJSONSchemaFromModel?: (model: NonNullable<BODY_MODEL | QUERY_MODEL | PARAMS_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
+        type: VovkValidationType;
+    }) => KnownAny;
     validate: (data: KnownAny, model: NonNullable<BODY_MODEL | QUERY_MODEL | PARAMS_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
         type: VovkValidationType;
         req: VovkRequest<KnownAny, KnownAny>;

package/dist/utils/withValidation.js

@@ -5,7 +5,7 @@ const HttpException_1 = require("../HttpException");
 const types_1 = require("../types");
 const setHandlerSchema_1 = require("./setHandlerSchema");
 const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
-function withValidation({ disableServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getHandlerSchema, validate, }) {
+function withValidation({ disableServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getJSONSchemaFromModel, validate, }) {
     const disableServerSideValidationKeys = disableServerSideValidation === false
         ? []
         : disableServerSideValidation === true
@@ -65,8 +65,24 @@ function withValidation({ disableServerSideValidation, skipSchemaEmission, valid
         }
         return outputHandler(req, handlerParams);
     };
-    if (getHandlerSchema) {
-        (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, getHandlerSchema({ skipSchemaEmissionKeys }));
+    if (getJSONSchemaFromModel) {
+        const validation = {};
+        if (body && !skipSchemaEmissionKeys.includes('body')) {
+            validation.body = getJSONSchemaFromModel(body, { type: 'body' });
+        }
+        if (query && !skipSchemaEmissionKeys.includes('query')) {
+            validation.query = getJSONSchemaFromModel(query, { type: 'query' });
+        }
+        if (params && !skipSchemaEmissionKeys.includes('params')) {
+            validation.params = getJSONSchemaFromModel(params, { type: 'params' });
+        }
+        if (output && !skipSchemaEmissionKeys.includes('output')) {
+            validation.output = getJSONSchemaFromModel(output, { type: 'output' });
+        }
+        if (iteration && !skipSchemaEmissionKeys.includes('iteration')) {
+            validation.iteration = getJSONSchemaFromModel(iteration, { type: 'iteration' });
+        }
+        (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, { validation });
     }
     return resultHandler;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.113",
+  "version": "3.0.0-draft.115",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "description": "RESTful RPC for Next.js - Transforms Next.js into a powerful REST API platform with RPC capabilities.",