vovk 3.0.0-draft.77 → 3.0.0-draft.79

package/dist/client/types.d.ts

@@ -91,10 +91,7 @@ export type VovkValidateOnClient = (input: {
     body?: unknown;
     query?: unknown;
     endpoint: string;
-}, validators: {
-    body?: unknown;
-    query?: unknown;
-}) => void | Promise<void>;
+}, validation: Exclude<VovkHandlerSchema['validation'], undefined>) => void | Promise<void>;
 export type VovkClientOptions<OPTS extends Record<string, KnownAny> = Record<string, never>> = {
     fetcher?: VovkClientFetcher<OPTS>;
     validateOnClient?: VovkValidateOnClient;

package/dist/createDecorator.js

@@ -21,7 +21,6 @@ function createDecorator(handler, initHandler) {
             method._sourceMethod = sourceMethod;
             // TODO define internal method type
             originalMethod._controller = controller;
-            originalMethod?._onSettled?.(controller);
             const handlerSchema = controller._handlers?.[propertyKey] ?? null;
             const initResultReturn = initHandler?.call(controller, ...args);
             const initResult = typeof initResultReturn === 'function' ? initResultReturn(handlerSchema) : initResultReturn;

package/dist/createVovkApp.js

@@ -28,17 +28,19 @@ function createVovkApp() {
             }
             const methods = vovkApp.routes[httpMethod].get(controller) ?? {};
             vovkApp.routes[httpMethod].set(controller, methods);
+            const originalMethod = controller[propertyKey];
+            originalMethod._controller = controller;
+            originalMethod._sourceMethod = originalMethod._sourceMethod ?? originalMethod;
+            const validation = originalMethod._sourceMethod._getValidation?.(controller);
             controller._handlers = {
                 ...controller._handlers,
                 [propertyKey]: {
+                    ...(validation ? { validation } : {}),
                     ...(controller._handlers ?? {})[propertyKey],
                     path,
                     httpMethod,
                 },
             };
-            const originalMethod = controller[propertyKey];
-            originalMethod._controller = controller;
-            originalMethod._sourceMethod = originalMethod._sourceMethod ?? originalMethod;
             methods[path] = controller[propertyKey];
             methods[path]._options = options;
         };
@@ -87,8 +89,6 @@ function createVovkApp() {
         async function GET_DEV(req, data) {
             const params = await data.params;
             if (params[Object.keys(params)[0]]?.[0] === '_schema_') {
-                // Wait for schema to be set (it can be set after decorators are called with another setTimeout)
-                await new Promise((resolve) => setTimeout(resolve, 10));
                 const schema = (0, getSchema_1.default)(options);
                 return vovkApp.respond(200, { schema });
             }

package/dist/openapi/openapi.d.ts

@@ -1,9 +1,10 @@
 import type { OperationObject } from 'openapi3-ts/oas31';
 import { fromSchema } from './fromSchema';
+import type { KnownAny } from '../types';
 type OperationObjectWithCustomProperties = OperationObject & {
-    [key in `${'x' | 'X'}-${string}`]: any;
+    [key in `${'x' | 'X'}-${string}`]: KnownAny;
 };
-declare const openapiDecorator: (openAPIOperationObject?: OperationObjectWithCustomProperties | undefined) => (target: import("..").KnownAny, propertyKey: string) => void;
+declare const openapiDecorator: (openAPIOperationObject?: OperationObjectWithCustomProperties | undefined) => (target: KnownAny, propertyKey: string) => void;
 export declare const openapi: typeof openapiDecorator & {
     fromSchema: typeof fromSchema;
 };

package/dist/openapi/openapi.js

@@ -48,7 +48,7 @@ const openapiDecorator = (0, createDecorator_1.createDecorator)(null, (openAPIOp
                 'properties' in handlerSchema.validation.query
                 ? {
                     parameters: Object.entries(handlerSchema.validation.query.properties)
-                        .filter(([, propSchema]) => propSchema.type === 'string')
+                        .filter(([, propSchema]) => propSchema.type !== 'object')
                         .map(([propName, propSchema]) => ({
                         name: propName,
                         in: 'query',

package/dist/utils/getSchema.js

@@ -19,7 +19,9 @@ function getSchema(options) {
             handlers: {
                 ...(exposeValidation
                     ? controller._handlers
-                    : Object.fromEntries(Object.entries(controller._handlers ?? {}).map(([key, value]) => [key, { ...value, validation: {} }]))),
+                    : Object.fromEntries(
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    Object.entries(controller._handlers ?? {}).map(([key, { validation: _v, ...value }]) => [key, value]))),
             },
         };
     }

package/dist/utils/setHandlerValidation.d.ts

@@ -1,4 +1,4 @@
 import type { KnownAny, VovkController, VovkHandlerSchema } from '../types';
 export declare function setHandlerValidation(h: ((...args: KnownAny[]) => KnownAny) & {
-    _onSettled?: (controller: VovkController) => void;
-}, validation: Pick<Exclude<VovkHandlerSchema['validation'], undefined>, 'body' | 'query' | 'output'>): Promise<void>;
+    _getValidation?: (controller: VovkController) => void;
+}, validation: Exclude<VovkHandlerSchema['validation'], undefined>): Promise<void>;

package/dist/utils/setHandlerValidation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setHandlerValidation = setHandlerValidation;
 async function setHandlerValidation(h, validation) {
-    h._onSettled = (controller) => {
+    h._getValidation = (controller) => {
         if (!controller) {
             throw new Error('Error setting client validators. Controller not found. Did you forget to use an HTTP decorator?');
         }
@@ -10,12 +10,6 @@ async function setHandlerValidation(h, validation) {
         if (!handlerName) {
             throw new Error('Error setting client validators. Handler not found.');
         }
-        controller._handlers = {
-            ...controller._handlers,
-            [handlerName]: {
-                ...controller._handlers?.[handlerName],
-                validation,
-            },
-        };
+        return validation;
     };
 }

package/package.json

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