vovk 3.0.0-draft.53 → 3.0.0-draft.55

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 
 
-> vovk@3.0.0-draft.53 build
+> vovk@3.0.0-draft.55 build
 > tsc
 
 \

package/.turbo/turbo-tsc.log

@@ -1,6 +1,6 @@
 
 
-> vovk@3.0.0-draft.52 tsc
+> vovk@3.0.0-draft.53 tsc
 > tsc --noEmit
 
 \

package/dist/client/createRPC.js

@@ -26,7 +26,8 @@ const createRPC = (controllerSchema, segmentName, options) => {
         throw new Error(`Unable to clientize. No schema for controller ${String(schema?.controllerName)} provided`);
     const controllerPrefix = trimPath(schema.prefix ?? '');
     const { fetcher: settingsFetcher = defaultFetcher_1.default } = options ?? {};
-    for (const [staticMethodName, { path, httpMethod, validation }] of Object.entries(schema.handlers)) {
+    for (const [staticMethodName, handlerSchema] of Object.entries(schema.handlers)) {
+        const { path, httpMethod, validation } = handlerSchema;
         const getEndpoint = ({ apiRoot, params, query, }) => {
             const mainPrefix = (apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/') +
                 (apiRoot.endsWith('/') ? apiRoot : `${apiRoot}/`) +
@@ -65,6 +66,7 @@ const createRPC = (controllerSchema, segmentName, options) => {
                 return Promise.resolve(fetcherPromise);
             return input.transform ? fetcherPromise.then(input.transform) : fetcherPromise;
         };
+        handler.schema = handlerSchema;
         // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }

package/dist/client/index.d.ts

@@ -1,4 +1,2 @@
-import { createRPC } from './createRPC';
-import type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient } from './types';
-export { createRPC };
-export type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient };
+export { createRPC } from './createRPC';
+export type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient } from './types';

package/dist/client/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPC = void 0;
-const createRPC_1 = require("./createRPC");
+var createRPC_1 = require("./createRPC");
 Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return createRPC_1.createRPC; } });

package/dist/client/types.d.ts

@@ -1,4 +1,4 @@
-import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkControllerBody, VovkControllerQuery, VovkControllerParams } from '../types';
+import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkControllerBody, VovkControllerQuery, VovkControllerParams, VovkHandlerSchema } from '../types';
 import type { StreamJSONResponse } from '../StreamJSONResponse';
 import type { NextResponse } from 'next/server';
 export type StaticMethodInput<T extends ControllerStaticMethod> = (VovkControllerBody<T> extends undefined | void ? {
@@ -26,7 +26,7 @@ export type StreamAsyncIterator<T> = {
 };
 type StaticMethodReturn<T extends ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? Awaited<ReturnType<T>> : ReturnType<T>;
 type StaticMethodReturnPromise<T extends ControllerStaticMethod> = ToPromise<StaticMethodReturn<T>>;
-type ClientMethod<T extends (...args: KnownAny[]) => void | object | StreamJSONResponse<STREAM> | Promise<StreamJSONResponse<STREAM>>, OPTS extends Record<string, KnownAny>, STREAM extends KnownAny = unknown> = <R>(options: (StaticMethodInput<T> extends {
+type ClientMethod<T extends (...args: KnownAny[]) => void | object | StreamJSONResponse<STREAM> | Promise<StreamJSONResponse<STREAM>>, OPTS extends Record<string, KnownAny>, STREAM extends KnownAny = unknown> = (<R>(options: (StaticMethodInput<T> extends {
     body?: undefined | null;
     query?: undefined;
     params?: undefined;
@@ -34,7 +34,9 @@ type ClientMethod<T extends (...args: KnownAny[]) => void | object | StreamJSONR
     params: StaticMethodInput<T>['params'];
 } : unknown : StaticMethodInput<T>) & (Partial<OPTS & {
     transform: (staticMethodReturn: Awaited<StaticMethodReturn<T>>) => R;
-}> | void)) => ReturnType<T> extends Promise<StreamJSONResponse<infer U>> | StreamJSONResponse<infer U> | Iterator<infer U> | AsyncIterator<infer U> ? Promise<StreamAsyncIterator<U>> : R extends object ? Promise<R> : StaticMethodReturnPromise<T>;
+}> | void)) => ReturnType<T> extends Promise<StreamJSONResponse<infer U>> | StreamJSONResponse<infer U> | Iterator<infer U> | AsyncIterator<infer U> ? Promise<StreamAsyncIterator<U>> : R extends object ? Promise<R> : StaticMethodReturnPromise<T>) & {
+    schema: VovkHandlerSchema;
+};
 type OmitNever<T> = {
     [K in keyof T as T[K] extends never ? never : K]: T[K];
 };

package/dist/createDecorator.d.ts

@@ -1,4 +1,4 @@
-import type { HandlerSchema, KnownAny, VovkController, VovkRequest } from './types';
+import type { VovkHandlerSchema, KnownAny, VovkController, VovkRequest } from './types';
 type Next = () => Promise<unknown>;
-export declare function createDecorator<ARGS extends unknown[], REQUEST = VovkRequest>(handler: null | ((this: VovkController, req: REQUEST, next: Next, ...args: ARGS) => unknown), initHandler?: (this: VovkController, ...args: ARGS) => Omit<HandlerSchema, 'path' | 'httpMethod'> | ((handlerSchema: HandlerSchema | null) => Omit<HandlerSchema, 'path' | 'httpMethod'>) | null | undefined): (...args: ARGS) => (target: KnownAny, propertyKey: string) => void;
+export declare function createDecorator<ARGS extends unknown[], REQUEST = VovkRequest>(handler: null | ((this: VovkController, req: REQUEST, next: Next, ...args: ARGS) => unknown), initHandler?: (this: VovkController, ...args: ARGS) => Omit<VovkHandlerSchema, 'path' | 'httpMethod'> | ((handlerSchema: VovkHandlerSchema | null) => Omit<VovkHandlerSchema, 'path' | 'httpMethod'>) | null | undefined): (...args: ARGS) => (target: KnownAny, propertyKey: string) => void;
 export {};

package/dist/createVovkApp.js

@@ -31,9 +31,11 @@ function createVovkApp() {
             controller._handlers = {
                 ...controller._handlers,
                 [propertyKey]: {
-                    ...(controller._handlers ?? {})[propertyKey],
                     path,
                     httpMethod,
+                    validation: {},
+                    custom: {},
+                    ...(controller._handlers ?? {})[propertyKey],
                 },
             };
             const originalMethod = controller[propertyKey];

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus as HttpStatus, HttpMethod as HttpMethod, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkSchema, type VovkWorkerSchema, type VovkControllerSchema } from './types';
+import { HttpStatus as HttpStatus, HttpMethod as HttpMethod, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkSchema, type VovkWorkerSchema, type VovkControllerSchema, type VovkHandlerSchema } from './types';
 import { type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, createRPC } from './client';
 import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
@@ -7,7 +7,7 @@ import { StreamJSONResponse } from './StreamJSONResponse';
 import { worker, createWPC } from './worker';
 import { generateStaticAPI } from './utils/generateStaticAPI';
 import { setClientValidatorsForHandler } from './utils/setClientValidatorsForHandler';
-export { type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkWorkerSchema, type VovkControllerSchema, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, worker, createWPC, createRPC, generateStaticAPI, setClientValidatorsForHandler, };
+export { type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkWorkerSchema, type VovkControllerSchema, type VovkHandlerSchema, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, worker, createWPC, createRPC, generateStaticAPI, setClientValidatorsForHandler, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types").DecoratorOptions) => (givenTarget: import("./types").KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types").DecoratorOptions) => (givenTarget: import("./types").KnownAny, propertyKey: string) => void;

package/dist/types.d.ts

@@ -3,20 +3,20 @@ import type { StreamJSONResponse } from './StreamJSONResponse';
 import { StreamAsyncIterator } from './client/types';
 export type KnownAny = any;
 export type StaticClass = Function;
-export type HandlerSchema = {
+export type VovkHandlerSchema = {
     path: string;
     httpMethod: HttpMethod;
-    validation?: {
+    validation: {
         query?: KnownAny;
         body?: KnownAny;
     };
-    custom?: Record<string, KnownAny>;
+    custom: Record<string, KnownAny>;
 };
 export type VovkControllerSchema = {
     controllerName: string;
     originalControllerName: string;
     prefix?: string;
-    handlers: Record<string, HandlerSchema>;
+    handlers: Record<string, VovkHandlerSchema>;
 };
 export type VovkWorkerSchema = {
     workerName: string;

package/dist/utils/getSchema.js

@@ -22,7 +22,7 @@ function getSchema(options) {
                     ? controller._handlers
                     : Object.fromEntries(Object.entries(controller._handlers ?? {}).map(([key, value]) => [
                         key,
-                        { ...value, validation: undefined },
+                        { ...value, validation: {} },
                     ]))),
             },
         };

package/dist/worker/index.d.ts

@@ -1,3 +1,2 @@
-import { worker } from './worker';
-import { createWPC } from './createWPC';
-export { worker, createWPC };
+export { worker } from './worker';
+export { createWPC } from './createWPC';

package/dist/worker/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWPC = exports.worker = void 0;
-const worker_1 = require("./worker");
+var worker_1 = require("./worker");
 Object.defineProperty(exports, "worker", { enumerable: true, get: function () { return worker_1.worker; } });
-const createWPC_1 = require("./createWPC");
+var createWPC_1 = require("./createWPC");
 Object.defineProperty(exports, "createWPC", { enumerable: true, get: function () { return createWPC_1.createWPC; } });

package/package.json

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

package/src/client/createRPC.ts

@@ -42,7 +42,8 @@ export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefault
   const controllerPrefix = trimPath(schema.prefix ?? '');
   const { fetcher: settingsFetcher = defaultFetcher } = options ?? {};
 
-  for (const [staticMethodName, { path, httpMethod, validation }] of Object.entries(schema.handlers)) {
+  for (const [staticMethodName, handlerSchema] of Object.entries(schema.handlers)) {
+    const { path, httpMethod, validation } = handlerSchema;
     const getEndpoint = ({
       apiRoot,
       params,
@@ -105,6 +106,8 @@ export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefault
       return input.transform ? fetcherPromise.then(input.transform) : fetcherPromise;
     };
 
+    handler.schema = handlerSchema;
+
     // @ts-expect-error TODO
     client[staticMethodName] = handler;
   }

package/src/client/index.ts

@@ -1,5 +1,2 @@
-import { createRPC } from './createRPC';
-import type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient } from './types';
-
-export { createRPC };
-export type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient };
+export { createRPC } from './createRPC';
+export type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient } from './types';

package/src/client/types.ts

@@ -5,6 +5,7 @@ import type {
   VovkControllerBody,
   VovkControllerQuery,
   VovkControllerParams,
+  VovkHandlerSchema,
 } from '../types';
 import type { StreamJSONResponse } from '../StreamJSONResponse';
 import type { NextResponse } from 'next/server';
@@ -40,7 +41,7 @@ type ClientMethod<
   T extends (...args: KnownAny[]) => void | object | StreamJSONResponse<STREAM> | Promise<StreamJSONResponse<STREAM>>,
   OPTS extends Record<string, KnownAny>,
   STREAM extends KnownAny = unknown,
-> = <R>(
+> = (<R>(
   options: (StaticMethodInput<T> extends { body?: undefined | null; query?: undefined; params?: undefined }
     ? unknown
     : Parameters<T>[0] extends void
@@ -61,7 +62,9 @@ type ClientMethod<
   ? Promise<StreamAsyncIterator<U>>
   : R extends object
     ? Promise<R>
-    : StaticMethodReturnPromise<T>;
+    : StaticMethodReturnPromise<T>) & {
+  schema: VovkHandlerSchema;
+};
 
 type OmitNever<T> = {
   [K in keyof T as T[K] extends never ? never : K]: T[K];

package/src/createDecorator.ts

@@ -1,4 +1,4 @@
-import type { HandlerSchema, KnownAny, VovkController, VovkRequest } from './types';
+import type { VovkHandlerSchema, KnownAny, VovkController, VovkRequest } from './types';
 
 type Next = () => Promise<unknown>;
 
@@ -8,8 +8,8 @@ export function createDecorator<ARGS extends unknown[], REQUEST = VovkRequest>(
     this: VovkController,
     ...args: ARGS
   ) =>
-    | Omit<HandlerSchema, 'path' | 'httpMethod'>
-    | ((handlerSchema: HandlerSchema | null) => Omit<HandlerSchema, 'path' | 'httpMethod'>)
+    | Omit<VovkHandlerSchema, 'path' | 'httpMethod'>
+    | ((handlerSchema: VovkHandlerSchema | null) => Omit<VovkHandlerSchema, 'path' | 'httpMethod'>)
     | null
     | undefined
 ) {
@@ -25,7 +25,7 @@ export function createDecorator<ARGS extends unknown[], REQUEST = VovkRequest>(
       }
       const sourceMethod = originalMethod._sourceMethod ?? originalMethod;
 
-      const handlerSchema: HandlerSchema | null = controller._handlers?.[propertyKey] ?? null;
+      const handlerSchema: VovkHandlerSchema | null = controller._handlers?.[propertyKey] ?? null;
       const initResultReturn = initHandler?.call(controller, ...args);
       const initResult = typeof initResultReturn === 'function' ? initResultReturn(handlerSchema) : initResultReturn;
 

package/src/createVovkApp.ts

@@ -7,6 +7,7 @@ import {
   type DecoratorOptions,
   type VovkRequest,
   type StaticClass,
+  VovkHandlerSchema,
 } from './types';
 import getSchema from './utils/getSchema';
 
@@ -47,9 +48,11 @@ export function createVovkApp() {
       controller._handlers = {
         ...controller._handlers,
         [propertyKey]: {
-          ...(controller._handlers ?? {})[propertyKey],
           path,
           httpMethod,
+          validation: {},
+          custom: {},
+          ...((controller._handlers ?? {})[propertyKey] as Partial<VovkHandlerSchema>),
         },
       };
 

package/src/index.ts

@@ -16,6 +16,7 @@ import {
   type VovkSchema,
   type VovkWorkerSchema,
   type VovkControllerSchema,
+  type VovkHandlerSchema,
 } from './types';
 import {
   type VovkClientOptions,
@@ -50,6 +51,7 @@ export {
   type VovkClientOptions,
   type VovkWorkerSchema,
   type VovkControllerSchema,
+  type VovkHandlerSchema,
   StreamJSONResponse,
   HttpException,
   HttpStatus,

package/src/types.ts

@@ -6,18 +6,18 @@ export type KnownAny = any; // eslint-disable-line @typescript-eslint/no-explici
 
 export type StaticClass = Function; // eslint-disable-line @typescript-eslint/no-unsafe-function-type
 
-export type HandlerSchema = {
+export type VovkHandlerSchema = {
   path: string;
   httpMethod: HttpMethod;
-  validation?: { query?: KnownAny; body?: KnownAny };
-  custom?: Record<string, KnownAny>;
+  validation: { query?: KnownAny; body?: KnownAny };
+  custom: Record<string, KnownAny>;
 };
 
 export type VovkControllerSchema = {
   controllerName: string;
   originalControllerName: string;
   prefix?: string;
-  handlers: Record<string, HandlerSchema>;
+  handlers: Record<string, VovkHandlerSchema>;
 };
 
 export type VovkWorkerSchema = {

package/src/utils/getSchema.ts

@@ -27,10 +27,7 @@ export default function getSchema(options: {
         ...(exposeValidation
           ? controller._handlers
           : Object.fromEntries(
-              Object.entries(controller._handlers ?? {}).map(([key, value]) => [
-                key,
-                { ...value, validation: undefined },
-              ])
+              Object.entries(controller._handlers ?? {}).map(([key, value]) => [key, { ...value, validation: {} }])
             )),
       },
     };

package/src/worker/index.ts

@@ -1,4 +1,2 @@
-import { worker } from './worker';
-import { createWPC } from './createWPC';
-
-export { worker, createWPC };
+export { worker } from './worker';
+export { createWPC } from './createWPC';