vovk 3.0.0-draft.120 → 3.0.0-draft.128

package/dist/client/createRPC.d.ts

@@ -1,3 +1,3 @@
 import type { KnownAny, VovkFullSchema } from '../types';
 import type { VovkClientOptions, VovkClient, VovkDefaultFetcherOptions } from './types';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(fullSchema: VovkFullSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(fullSchema: VovkFullSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/dist/client/createRPC.js

@@ -77,6 +77,7 @@ const createRPC = (fullSchema, segmentName, rpcModuleName, options) => {
         handler.controllerSchema = controllerSchema;
         handler.segmentSchema = segmentSchema;
         handler.fullSchema = fullSchema;
+        handler.isRPC = true;
         // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }

package/dist/client/fetcher.d.ts

@@ -1,10 +1,8 @@
 import type { VovkDefaultFetcherOptions, VovkClientFetcher } from './types';
+import { KnownAny } from '../types';
 export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
-declare function createFetcher<T = unknown>({ prepareRequestInit, transformResponse, }?: {
-    prepareRequestInit?: (init: RequestInit, options: VovkDefaultFetcherOptions & T) => RequestInit | Promise<RequestInit>;
-    transformResponse?: (resp: unknown, options: VovkDefaultFetcherOptions & T, init: RequestInit) => unknown;
-}): VovkClientFetcher<VovkDefaultFetcherOptions & T>;
-export declare const fetcher: VovkClientFetcher<VovkDefaultFetcherOptions> & {
-    create: typeof createFetcher;
-};
-export {};
+export declare function createFetcher<T extends Record<string, KnownAny> = Record<string, never>>({ prepareRequestInit, transformResponse, }?: {
+    prepareRequestInit?: (init: RequestInit, options: VovkDefaultFetcherOptions<T> & T) => RequestInit | Promise<RequestInit> | void | Promise<void>;
+    transformResponse?: (resp: unknown, options: VovkDefaultFetcherOptions<T> & T, init: RequestInit) => unknown;
+}): VovkClientFetcher<VovkDefaultFetcherOptions<T>>;
+export declare const fetcher: VovkClientFetcher<VovkDefaultFetcherOptions<Record<string, never>>>;

package/dist/client/fetcher.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetcher = exports.DEFAULT_ERROR_MESSAGE = void 0;
+exports.createFetcher = createFetcher;
 const types_1 = require("../types");
 const HttpException_1 = require("../HttpException");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at default fetcher';
@@ -50,7 +51,9 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
         else if (body) {
             requestInit.body = JSON.stringify(body);
         }
-        requestInit = prepareRequestInit ? await prepareRequestInit(requestInit, options) : requestInit;
+        requestInit = prepareRequestInit
+            ? ((await prepareRequestInit(requestInit, options)) ?? requestInit)
+            : requestInit;
         let response;
         try {
             response = await fetch(endpoint, requestInit);
@@ -76,10 +79,10 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
             resp = response;
         }
         resp = await resp;
-        return transformResponse ? await transformResponse(resp, options, requestInit) : resp;
+        return transformResponse
+            ? ((await transformResponse(resp, options, requestInit)) ?? resp)
+            : resp;
     };
     return newFetcher;
 }
-exports.fetcher = Object.assign(createFetcher({
-    transformResponse: (resp) => resp,
-}), { create: createFetcher });
+exports.fetcher = createFetcher();

package/dist/client/index.d.ts

@@ -1,3 +1,3 @@
 export { createRPC } from './createRPC';
-export { fetcher } from './fetcher';
+export { fetcher, createFetcher } from './fetcher';
 export type { VovkClient, VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient, VovkStreamAsyncIterable, } from './types';

package/dist/client/index.js

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

package/dist/client/types.d.ts

@@ -26,7 +26,10 @@ export type VovkStreamAsyncIterable<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 | JSONLinesResponse<STREAM> | Promise<JSONLinesResponse<STREAM>>, OPTS extends Record<string, KnownAny>, STREAM extends KnownAny = unknown> = (<R>(options: (StaticMethodInput<T> extends {
+type StaticMethodOption<T extends ((...args: KnownAny[]) => void | object | JSONLinesResponse<STREAM> | Promise<JSONLinesResponse<STREAM>>) & {
+    __output?: KnownAny;
+    __iteration?: KnownAny;
+}, OPTS extends Record<string, KnownAny>, STREAM extends KnownAny = unknown, R = KnownAny, F extends VovkDefaultFetcherOptions<KnownAny> = VovkDefaultFetcherOptions<KnownAny>> = (StaticMethodInput<T> extends {
     body?: undefined | null;
     query?: undefined;
     params?: undefined;
@@ -34,11 +37,19 @@ type ClientMethod<T extends (...args: KnownAny[]) => void | object | JSONLinesRe
     params: StaticMethodInput<T>['params'];
 } : unknown : StaticMethodInput<T>) & (Partial<OPTS & {
     transform: (staticMethodReturn: Awaited<StaticMethodReturn<T>>) => R;
-}> | void)) => ReturnType<T> extends Promise<JSONLinesResponse<infer U>> | JSONLinesResponse<infer U> | Iterator<infer U> | AsyncIterator<infer U> ? Promise<VovkStreamAsyncIterable<U>> : R extends object ? Promise<R> : StaticMethodReturnPromise<T>) & {
+    fetcher: VovkClientFetcher<F>;
+}> | void) & (Partial<F extends VovkDefaultFetcherOptions<infer U> ? Omit<U, keyof VovkDefaultFetcherOptions<OPTS>> : void> | void);
+type ClientMethod<T extends ((...args: KnownAny[]) => void | object | JSONLinesResponse<STREAM> | Promise<JSONLinesResponse<STREAM>>) & {
+    __output?: KnownAny;
+    __iteration?: KnownAny;
+}, OPTS extends Record<string, KnownAny>, STREAM extends KnownAny = unknown> = (<R, F extends VovkDefaultFetcherOptions<KnownAny> = VovkDefaultFetcherOptions<OPTS>>(options: StaticMethodOption<T, OPTS, STREAM, R, F>) => ReturnType<T> extends Promise<JSONLinesResponse<infer U>> | JSONLinesResponse<infer U> | Iterator<infer U> | AsyncIterator<infer U> ? Promise<VovkStreamAsyncIterable<U>> : R extends object ? Promise<R> : StaticMethodReturnPromise<T>) & {
+    isRPC: true;
     schema: VovkHandlerSchema;
     controllerSchema: VovkControllerSchema;
     segmentSchema: VovkSegmentSchema;
     fullSchema: VovkFullSchema;
+    __output: T['__output'];
+    __iteration: T['__iteration'];
 };
 type OmitNever<T> = {
     [K in keyof T as T[K] extends never ? never : K]: T[K];
@@ -51,7 +62,7 @@ type VovkClientWithNever<T, OPTS extends {
 export type VovkClient<T, OPTS extends {
     [key: string]: KnownAny;
 }> = OmitNever<VovkClientWithNever<T, OPTS>>;
-export type VovkClientFetcher<OPTS extends Record<string, KnownAny> = Record<string, never>, T = KnownAny> = (options: {
+export type VovkClientFetcher<OPTS, T = KnownAny> = (options: {
     name: keyof T;
     httpMethod: HttpMethod;
     getEndpoint: (data: {
@@ -80,11 +91,11 @@ export type VovkClientFetcher<OPTS extends Record<string, KnownAny> = Record<str
         [key: string]: string;
     };
 } & OPTS) => KnownAny;
-export interface VovkDefaultFetcherOptions {
+export interface VovkDefaultFetcherOptions<T> {
     apiRoot?: string;
     disableClientValidation?: boolean;
     validateOnClient?: VovkValidateOnClient;
-    fetcher?: VovkClientFetcher;
+    fetcher?: VovkClientFetcher<T>;
     interpretAs?: string;
     init?: RequestInit;
 }

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus as HttpStatus, HttpMethod as HttpMethod, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType } from './types';
-import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher } from './client';
+import { HttpStatus, HttpMethod, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType } from './types';
+import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher } from './client';
 import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
 import { JSONLinesResponse } from './JSONLinesResponse';
 import { generateStaticAPI } from './utils/generateStaticAPI';
 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 VovkValidationType, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, generateStaticAPI, withValidation, };
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, 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.withValidation = exports.generateStaticAPI = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = 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.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = void 0;
 const createVovkApp_1 = require("./createVovkApp");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_1.createVovkApp; } });
 const types_1 = require("./types");
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "HttpMethod", { enumerable: true, get: function (
 const client_1 = require("./client");
 Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return client_1.createRPC; } });
 Object.defineProperty(exports, "fetcher", { enumerable: true, get: function () { return client_1.fetcher; } });
+Object.defineProperty(exports, "createFetcher", { enumerable: true, get: function () { return client_1.createFetcher; } });
 const HttpException_1 = require("./HttpException");
 Object.defineProperty(exports, "HttpException", { enumerable: true, get: function () { return HttpException_1.HttpException; } });
 const createDecorator_1 = require("./createDecorator");

package/dist/types.d.ts

@@ -25,6 +25,7 @@ export type VovkControllerSchema = {
     handlers: Record<string, VovkHandlerSchema>;
 };
 export type VovkSegmentSchema = {
+    $schema: string;
     emitSchema: boolean;
     segmentName: string;
     controllers: Record<string, VovkControllerSchema>;
@@ -86,16 +87,28 @@ export type VovkControllerBody<T extends (...args: KnownAny) => KnownAny> = Awai
 export type VovkControllerQuery<T extends (...args: KnownAny) => KnownAny> = ReturnType<Parameters<T>[0]['vovk']['query']>;
 export type VovkControllerParams<T extends (...args: KnownAny) => KnownAny> = Parameters<T>[1] extends object ? Parameters<T>[1] : ReturnType<Parameters<T>[0]['vovk']['params']>;
 export type VovkControllerYieldType<T extends (req: VovkRequest<KnownAny, KnownAny>) => KnownAny> = T extends (...args: KnownAny[]) => AsyncGenerator<infer Y, KnownAny, KnownAny> ? Y : T extends (...args: KnownAny[]) => Generator<infer Y, KnownAny, KnownAny> ? Y : T extends (...args: KnownAny[]) => Promise<JSONLinesResponse<infer Y>> | JSONLinesResponse<infer Y> ? Y : never;
-export type VovkControllerOutput<T extends ((...args: KnownAny) => KnownAny) & {
+export type VovkOutput<T extends ((...args: KnownAny) => KnownAny) & {
     __output?: KnownAny;
 }> = T['__output'];
-export type VovkControllerIteration<T extends ((...args: KnownAny) => KnownAny) & {
+export type VovkIteration<T extends ((...args: KnownAny) => KnownAny) & {
     __iteration?: KnownAny;
 }> = T['__iteration'];
-export type VovkBody<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['body'];
-export type VovkQuery<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['query'];
-export type VovkParams<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['params'];
-export type VovkYieldType<T extends (...args: KnownAny[]) => unknown> = T extends (...args: KnownAny[]) => Promise<VovkStreamAsyncIterable<infer Y>> ? Y : never;
+export type VovkClientBody<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['body'];
+export type VovkClientQuery<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['query'];
+export type VovkClientParams<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['params'];
+export type VovkClientYieldType<T extends (...args: KnownAny[]) => unknown> = T extends (...args: KnownAny[]) => Promise<VovkStreamAsyncIterable<infer Y>> ? Y : never;
+export type VovkBody<T extends (...args: KnownAny[]) => unknown> = T extends {
+    isRPC: true;
+} ? VovkClientBody<T> : VovkControllerBody<T>;
+export type VovkQuery<T extends (...args: KnownAny[]) => unknown> = T extends {
+    isRPC: true;
+} ? VovkClientQuery<T> : VovkControllerQuery<T>;
+export type VovkParams<T extends (...args: KnownAny[]) => unknown> = T extends {
+    isRPC: true;
+} ? VovkClientParams<T> : VovkControllerParams<T>;
+export type VovkYieldType<T extends (...args: KnownAny[]) => unknown> = T extends {
+    isRPC: true;
+} ? VovkClientYieldType<T> : VovkControllerYieldType<T>;
 export type VovkReturnType<T extends (...args: KnownAny) => unknown> = Awaited<ReturnType<T>>;
 export type StreamAbortMessage = {
     isError: true;
@@ -103,6 +116,7 @@ export type StreamAbortMessage = {
 };
 export type VovkValidationType = 'body' | 'query' | 'params' | 'output' | 'iteration';
 export type VovkFullSchema = {
+    $schema: string;
     config: Partial<VovkStrictConfig>;
     segments: Record<string, VovkSegmentSchema>;
 };
@@ -196,16 +210,17 @@ export type ClientTemplateDef = {
     requires?: Record<string, string>;
 };
 export type VovkConfig = {
+    $schema?: string;
     emitConfig?: boolean | (keyof VovkStrictConfig)[];
     schemaOutDir?: string;
     fullClient?: ClientConfigFull;
     segmentedClient?: ClientConfigSegmented;
     bundle?: {
         outDir?: string;
-        noReadme?: boolean;
-        noPackage?: boolean;
+        requires?: Record<string, string>;
         tsClientOutDir?: string;
         dontDeleteTsClientOutDirAfter?: boolean;
+        sourcemap?: boolean;
     };
     imports?: {
         fetcher?: string | [string, string] | [string];

package/dist/utils/getSchema.js

@@ -20,6 +20,7 @@ function getSchema(options) {
     const exposeValidation = options?.exposeValidation ?? true;
     const emitSchema = options.emitSchema ?? true;
     const schema = {
+        $schema: `https://vovk.dev/api/schema/v3/segment.json`, // TODO use enum from vovk-cli
         emitSchema,
         segmentName: options.segmentName ?? '',
         controllers: {},

package/dist/utils/parseQuery.js

@@ -145,7 +145,7 @@ function parseQuery(queryString) {
         .split('&');
     for (const pair of pairs) {
         const [rawKey, rawVal = ''] = pair.split('=');
-        const decodedKey = decodeURIComponent(rawKey || '');
+        const decodedKey = decodeURIComponent(rawKey);
         const decodedVal = decodeURIComponent(rawVal);
         // Parse bracket notation
         const pathSegments = parseKey(decodedKey);

package/package.json

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