vovk 3.0.0-draft.93 → 3.0.0-draft.95

package/dist/createVovkApp.js

@@ -28,11 +28,11 @@ const assignSchema = ({ controller, propertyKey, path, options, httpMethod, vovk
     const originalMethod = controller[propertyKey];
     originalMethod._controller = controller;
     originalMethod._sourceMethod = originalMethod._sourceMethod ?? originalMethod;
-    const validation = originalMethod._sourceMethod._getValidation?.(controller);
+    const schema = originalMethod._sourceMethod._getSchema?.(controller);
     controller._handlers = {
         ...controller._handlers,
         [propertyKey]: {
-            ...(validation ? { validation } : {}),
+            ...schema,
             ...(controller._handlers ?? {})[propertyKey],
             path,
             httpMethod,

package/dist/index.d.ts

@@ -5,8 +5,8 @@ import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
 import { StreamJSONResponse } from './StreamJSONResponse';
 import { generateStaticAPI } from './utils/generateStaticAPI';
-import { setHandlerValidation } from './utils/setHandlerValidation';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, generateStaticAPI, setHandlerValidation, };
+import { withValidation } from './utils/withValidation';
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, generateStaticAPI, withValidation, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.setHandlerValidation = exports.generateStaticAPI = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.StreamJSONResponse = void 0;
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.withValidation = exports.generateStaticAPI = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.StreamJSONResponse = void 0;
 const createVovkApp_1 = require("./createVovkApp");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_1.createVovkApp; } });
 const types_1 = require("./types");
@@ -18,6 +18,6 @@ const StreamJSONResponse_1 = require("./StreamJSONResponse");
 Object.defineProperty(exports, "StreamJSONResponse", { enumerable: true, get: function () { return StreamJSONResponse_1.StreamJSONResponse; } });
 const generateStaticAPI_1 = require("./utils/generateStaticAPI");
 Object.defineProperty(exports, "generateStaticAPI", { enumerable: true, get: function () { return generateStaticAPI_1.generateStaticAPI; } });
-const setHandlerValidation_1 = require("./utils/setHandlerValidation");
-Object.defineProperty(exports, "setHandlerValidation", { enumerable: true, get: function () { return setHandlerValidation_1.setHandlerValidation; } });
+const withValidation_1 = require("./utils/withValidation");
+Object.defineProperty(exports, "withValidation", { enumerable: true, get: function () { return withValidation_1.withValidation; } });
 _a = (0, createVovkApp_1.createVovkApp)(), exports.get = _a.get, exports.post = _a.post, exports.put = _a.put, exports.patch = _a.patch, exports.del = _a.del, exports.head = _a.head, exports.options = _a.options, exports.prefix = _a.prefix, exports.initVovk = _a.initVovk;

package/dist/utils/setHandlerSchema.d.ts

@@ -0,0 +1,4 @@
+import type { KnownAny, VovkController, VovkHandlerSchema } from '../types';
+export declare function setHandlerSchema(h: ((...args: KnownAny[]) => KnownAny) & {
+    _getSchema?: (controller: VovkController) => Omit<VovkHandlerSchema, 'httpMethod' | 'path'>;
+}, schema: Omit<VovkHandlerSchema, 'httpMethod' | 'path'>): Promise<void>;

package/dist/utils/{setHandlerValidation.js → setHandlerSchema.js}

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

package/dist/utils/withValidation.d.ts

@@ -0,0 +1,13 @@
+import { VovkHandlerSchema, 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>({ body, query, params, output, handle, getHandlerSchema, validate, }: {
+    body?: BODY_MODEL;
+    query?: QUERY_MODEL;
+    params?: PARAMS_MODEL;
+    output?: OUTPUT_MODEL;
+    handle: T;
+    getHandlerSchema?: () => Omit<VovkHandlerSchema, 'httpMethod' | 'path'>;
+    validate: (data: KnownAny, model: NonNullable<BODY_MODEL | QUERY_MODEL | PARAMS_MODEL | OUTPUT_MODEL>, meta: {
+        type: 'body' | 'query' | 'params' | 'output';
+        req: VovkRequest<KnownAny, KnownAny>;
+    }) => KnownAny;
+}): T;

package/dist/utils/withValidation.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withValidation = withValidation;
+const HttpException_1 = require("../HttpException");
+const types_1 = require("../types");
+const setHandlerSchema_1 = require("./setHandlerSchema");
+function withValidation({ body, query, params, output, handle, getHandlerSchema, validate, }) {
+    const outputHandler = async (req, handlerParams) => {
+        const data = await handle(req, handlerParams);
+        if (output) {
+            if (!data) {
+                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
+            }
+            await validate(data, output, { type: 'output', req });
+        }
+        return data;
+    };
+    const resultHandler = async (req, handlerParams) => {
+        if (body) {
+            const data = await req.json();
+            const instance = (await validate(data, body, { type: 'body', req })) ?? data;
+            // redeclare to add ability to call req.json() again
+            req.json = () => Promise.resolve(data);
+            req.vovk.body = () => Promise.resolve(instance);
+        }
+        if (query) {
+            const data = req.vovk.query();
+            const instance = (await validate(data, query, { type: 'query', req })) ?? data;
+            req.vovk.query = () => instance;
+        }
+        if (params) {
+            const data = req.vovk.params();
+            const instance = (await validate(data, params, { type: 'params', req })) ?? data;
+            req.vovk.params = () => instance;
+        }
+        return outputHandler(req, handlerParams);
+    };
+    if (getHandlerSchema) {
+        (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, getHandlerSchema());
+    }
+    return resultHandler;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.93",
+  "version": "3.0.0-draft.95",
   "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.",

package/dist/utils/setHandlerValidation.d.ts

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