vovk 3.0.0-draft.3 → 3.0.0-draft.31

package/README.md

@@ -28,7 +28,6 @@
   <a href="https://github.com/finom/vovk/actions/workflows/main.yml"><img src="https://github.com/finom/vovk/actions/workflows/main.yml/badge.svg" alt="Build status" /></a>
 </p>
 
-
  <br />
 
 Example back-end Controller Class:
@@ -37,7 +36,7 @@ Example back-end Controller Class:
 // /src/modules/post/PostController.ts
 import { get, prefix, type VovkRequest } from 'vovk';
 import PostService from './PostService';
- 
+
 @prefix('posts')
 export default class PostController {
   /**
@@ -47,19 +46,19 @@ export default class PostController {
   @post(':postId/comments')
   static async createComment(
     // decorate NextRequest type with body and query types
-    req: VovkRequest<
-      { content: string; userId: string }, 
-      { notificationType: 'push' | 'email' }
-    >,
+    req: VovkRequest<{ content: string; userId: string }, { notificationType: 'push' | 'email' }>,
     { postId }: { postId: string } // params
   ) {
     // use standard Next.js API to get body and query
     const { content, userId } = await req.json();
     const notificationType = req.nextUrl.searchParams.get('notificationType');
- 
+
     // perform the request to the database in a custom service
-    return PostService.createComment({ 
-      postId, content, userId, notificationType,
+    return PostService.createComment({
+      postId,
+      content,
+      userId,
+      notificationType,
     });
   }
 }
@@ -72,23 +71,25 @@ Example component that uses the auto-generated client library:
 import { useState } from 'react';
 import { PostController } from 'vovk-client';
 import type { VovkReturnType } from 'vovk';
- 
+
 export default function Example() {
   const [response, setResponse] = useState<VovkReturnType<typeof PostController.createComment>>();
- 
+
   return (
     <>
       <button
-        onClick={async () => setResponse(
-          await PostController.createComment({
-            body: { 
-              content: 'Hello, World!', 
-              userId: '1', 
-            },
-            params: { postId: '69' },
-            query: { notificationType: 'push' }
-          })
-        )}
+        onClick={async () =>
+          setResponse(
+            await PostController.createComment({
+              body: {
+                content: 'Hello, World!',
+                userId: '1',
+              },
+              params: { postId: '69' },
+              query: { notificationType: 'push' },
+            })
+          )
+        }
       >
         Post a comment
       </button>
@@ -103,9 +104,9 @@ Alternatively, the resource can be fetched wit the regular `fetch` function:
 ```ts
 fetch('/api/posts/69?notificationType=push', {
   method: 'POST',
-  body: JSON.stringify({ 
-    content: 'Hello, World!', 
-    userId: '1', 
+  body: JSON.stringify({
+    content: 'Hello, World!',
+    userId: '1',
   }),
-})
+});
 ```

package/{StreamResponse.d.ts → StreamJSONResponse.d.ts}

@@ -1,8 +1,9 @@
 import { _KnownAny as KnownAny, _StreamAbortMessage as StreamAbortMessage } from './types';
 import './utils/shim';
-export declare class _StreamResponse<T> extends Response {
+export declare class _StreamJSONResponse<T> extends Response {
     static defaultHeaders: {
-        'Content-Type': string;
+        'content-type': string;
+        'x-vovk-stream': string;
     };
     isClosed: boolean;
     controller?: ReadableStreamDefaultController;

package/{StreamResponse.js → StreamJSONResponse.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._StreamResponse = void 0;
+exports._StreamJSONResponse = void 0;
 require("./utils/shim");
-class _StreamResponse extends Response {
+class _StreamJSONResponse extends Response {
     static defaultHeaders = {
-        'Content-Type': 'text/plain; charset=utf-8',
+        'content-type': 'text/plain; charset=utf-8',
+        'x-vovk-stream': 'true',
     };
     isClosed = false;
     controller;
@@ -23,7 +24,7 @@ class _StreamResponse extends Response {
         });
         super(readableStream, {
             ...init,
-            headers: init?.headers ?? _StreamResponse.defaultHeaders,
+            headers: init?.headers ?? _StreamJSONResponse.defaultHeaders,
         });
         this.readableStream = readableStream;
         this.encoder = encoder;
@@ -50,4 +51,4 @@ class _StreamResponse extends Response {
         this.close();
     }
 }
-exports._StreamResponse = _StreamResponse;
+exports._StreamJSONResponse = _StreamJSONResponse;

package/{Segment.d.ts → VovkApp.d.ts}

@@ -1,8 +1,8 @@
 import { _HttpMethod as HttpMethod, _HttpStatus as HttpStatus, type _RouteHandler as RouteHandler, type _VovkController as VovkController, type _DecoratorOptions as DecoratorOptions, type _VovkRequest as VovkRequest } from './types';
-export declare class _Segment {
+export declare class _VovkApp {
     #private;
     private static getHeadersFromOptions;
-    _routes: Record<HttpMethod, Map<VovkController, Record<string, RouteHandler>>>;
+    routes: Record<HttpMethod, Map<VovkController, Record<string, RouteHandler>>>;
     GET: (req: VovkRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;

package/{Segment.js → VovkApp.js}

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._Segment = void 0;
+exports._VovkApp = void 0;
 const types_1 = require("./types");
 const HttpException_1 = require("./HttpException");
-const StreamResponse_1 = require("./StreamResponse");
+const StreamJSONResponse_1 = require("./StreamJSONResponse");
 const reqQuery_1 = __importDefault(require("./utils/reqQuery"));
 const reqMeta_1 = __importDefault(require("./utils/reqMeta"));
-class _Segment {
+const reqForm_1 = __importDefault(require("./utils/reqForm"));
+class _VovkApp {
     static getHeadersFromOptions(options) {
         if (!options)
             return {};
@@ -25,7 +26,7 @@ class _Segment {
         };
         return headers;
     }
-    _routes = {
+    routes = {
         GET: new Map(),
         POST: new Map(),
         PUT: new Map(),
@@ -50,15 +51,16 @@ class _Segment {
             },
         });
     };
-    #respondWithError = (statusCode, message, options) => {
+    #respondWithError = (statusCode, message, options, cause) => {
         return this.respond(statusCode, {
+            cause,
             statusCode,
             message,
             isError: true,
         }, options);
     };
     #callMethod = async (httpMethod, req, params) => {
-        const controllers = this._routes[httpMethod];
+        const controllers = this.routes[httpMethod];
         const methodParams = {};
         const path = params[Object.keys(params)[0]];
         const handlers = {};
@@ -127,6 +129,7 @@ class _Segment {
             body: () => req.json(),
             query: () => (0, reqQuery_1.default)(req),
             meta: (meta) => (0, reqMeta_1.default)(req, meta),
+            form: () => (0, reqForm_1.default)(req),
         };
         try {
             const result = await staticMethod.call(controller, req, methodParams);
@@ -137,9 +140,9 @@ class _Segment {
                     (Reflect.has(result, Symbol.asyncIterator) &&
                         typeof result[Symbol.asyncIterator] === 'function'));
             if (isIterator && !(result instanceof Array)) {
-                const streamResponse = new StreamResponse_1._StreamResponse({
+                const streamResponse = new StreamJSONResponse_1._StreamJSONResponse({
                     headers: {
-                        ...StreamResponse_1._StreamResponse.defaultHeaders,
+                        ...StreamJSONResponse_1._StreamJSONResponse.defaultHeaders,
                         ..._a.getHeadersFromOptions(staticMethod._options),
                     },
                 });
@@ -172,11 +175,11 @@ class _Segment {
             }
             if (err.message !== 'NEXT_REDIRECT' && err.message !== 'NEXT_NOT_FOUND') {
                 const statusCode = err.statusCode ?? types_1._HttpStatus.INTERNAL_SERVER_ERROR;
-                return this.#respondWithError(statusCode, err.message, staticMethod._options);
+                return this.#respondWithError(statusCode, err.message, staticMethod._options, err.cause);
             }
             throw e; // if NEXT_REDIRECT or NEXT_NOT_FOUND, rethrow it
         }
     };
 }
-exports._Segment = _Segment;
-_a = _Segment;
+exports._VovkApp = _VovkApp;
+_a = _VovkApp;

package/client/clientizeController.d.ts

@@ -1,4 +1,4 @@
 import { type _VovkControllerSchema as VovkControllerSchema, type _KnownAny as KnownAny } from '../types';
 import { type _VovkClientOptions as VovkClientOptions, type _VovkClient as VovkClient, type _VovkDefaultFetcherOptions as VovkDefaultFetcherOptions } from './types';
 export declare const ARRAY_QUERY_KEY = "_vovkarr";
-export declare const _clientizeController: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(givenController: VovkControllerSchema, segmentName?: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const _clientizeController: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(controllerSchema: VovkControllerSchema, segmentName?: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/client/clientizeController.js

@@ -36,27 +36,26 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${hasQuery ? '?' : ''}${searchParams.toString()}`;
 };
-const _clientizeController = (givenController, segmentName, options) => {
-    const controller = givenController;
+const _clientizeController = (controllerSchema, segmentName, options) => {
+    const schema = controllerSchema;
     const client = {};
-    if (!controller)
-        throw new Error(`Unable to clientize. Controller schema is not provided`);
-    const schema = controller._handlers;
     if (!schema)
-        throw new Error(`Unable to clientize. No schema for controller ${String(controller?._controllerName)}`);
-    const controllerPrefix = trimPath(controller._prefix ?? '');
+        throw new Error(`Unable to clientize. Controller schema is not provided`);
+    if (!schema.handlers)
+        throw new Error(`Unable to clientize. No schema for controller ${String(schema?.controllerName)}`);
+    const controllerPrefix = trimPath(schema.prefix ?? '');
     const { fetcher: settingsFetcher = defaultFetcher_1.default } = options ?? {};
-    for (const [staticMethodName, { path, httpMethod, clientValidators }] of Object.entries(schema)) {
-        const getEndpoint = ({ prefix, params, query, }) => {
-            const mainPrefix = (prefix.startsWith('http://') || prefix.startsWith('https://') || prefix.startsWith('/') ? '' : '/') +
-                (prefix.endsWith('/') ? prefix : `${prefix}/`) +
+    for (const [staticMethodName, { path, httpMethod, validation }] of Object.entries(schema.handlers)) {
+        const getEndpoint = ({ apiRoot, params, query, }) => {
+            const mainPrefix = (apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/') +
+                (apiRoot.endsWith('/') ? apiRoot : `${apiRoot}/`) +
                 (segmentName ? `${segmentName}/` : '');
             return mainPrefix + getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query);
         };
         const handler = (input = {}) => {
             const fetcher = input.fetcher ?? settingsFetcher;
             const validate = async ({ body, query, endpoint }) => {
-                await (input.validateOnClient ?? options?.validateOnClient)?.({ body, query, endpoint }, clientValidators ?? {});
+                await (input.validateOnClient ?? options?.validateOnClient)?.({ body, query, endpoint }, validation ?? {});
             };
             const internalOptions = {
                 name: staticMethodName,
@@ -85,7 +84,7 @@ const _clientizeController = (givenController, segmentName, options) => {
                 return Promise.resolve(fetcherPromise);
             return input.transform ? fetcherPromise.then(input.transform) : fetcherPromise;
         };
-        // @ts-expect-error TODO: Fix this
+        // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }
     return client;

package/client/defaultFetcher.js

@@ -6,8 +6,8 @@ const HttpException_1 = require("../HttpException");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultFetcher';
 // defaultFetcher uses HttpException class to throw errors of fake HTTP status 0 if client-side error occurs
 // For normal HTTP errors, it uses message and status code from the response of VovkErrorResponse type
-const defaultFetcher = async ({ httpMethod, getEndpoint, validate, defaultHandler, defaultStreamHandler }, { params, query, body, prefix = '/api', ...options }) => {
-    const endpoint = getEndpoint({ prefix, params, query });
+const defaultFetcher = async ({ httpMethod, getEndpoint, validate, defaultHandler, defaultStreamHandler }, { params, query, body, apiRoot = '/api', ...options }) => {
+    const endpoint = getEndpoint({ apiRoot, params, query });
     if (!options.disableClientValidation) {
         try {
             await validate({ body, query, endpoint });
@@ -41,7 +41,7 @@ const defaultFetcher = async ({ httpMethod, getEndpoint, validate, defaultHandle
     if (response.headers.get('content-type')?.includes('application/json')) {
         return defaultHandler(response);
     }
-    if (response.headers.get('content-type')?.includes('text/plain; charset=utf-8')) {
+    if (response.headers.get('x-vovk-stream') === 'true') {
         return defaultStreamHandler(response);
     }
     return response;

package/client/defaultHandler.js

@@ -14,7 +14,8 @@ const _defaultHandler = async (response) => {
     }
     if (!response.ok) {
         // handle server errors
-        throw new HttpException_1._HttpException(response.status, result?.message ?? exports.DEFAULT_ERROR_MESSAGE);
+        const errorResponse = result;
+        throw new HttpException_1._HttpException(response.status, errorResponse?.message ?? exports.DEFAULT_ERROR_MESSAGE, errorResponse?.cause);
     }
     return result;
 };

package/client/types.d.ts

@@ -1,5 +1,5 @@
 import type { _KnownAny as KnownAny, _HttpMethod as HttpMethod, _ControllerStaticMethod, _VovkControllerBody, _VovkControllerQuery, _VovkControllerParams } from '../types';
-import { _StreamResponse as StreamResponse } from '../StreamResponse';
+import { _StreamJSONResponse as StreamJSONResponse } from '../StreamJSONResponse';
 import type { NextResponse } from 'next/server';
 export type _StaticMethodInput<T extends _ControllerStaticMethod> = (_VovkControllerBody<T> extends undefined | void ? {
     body?: undefined;
@@ -24,9 +24,9 @@ export type _StreamAsyncIterator<T> = {
     [Symbol.asyncIterator](): AsyncIterator<T>;
     cancel: () => Promise<void> | void;
 };
-type StaticMethodReturn<T extends _ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? unknown : ReturnType<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 | StreamResponse<STREAM> | Promise<StreamResponse<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,7 @@ type ClientMethod<T extends (...args: KnownAny[]) => void | object | StreamRespo
     params: _StaticMethodInput<T>['params'];
 } : unknown : _StaticMethodInput<T>) & (Partial<OPTS & {
     transform: (staticMethodReturn: Awaited<StaticMethodReturn<T>>) => R;
-}> | void)) => ReturnType<T> extends Promise<StreamResponse<infer U>> | StreamResponse<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>;
 type OmitNever<T> = {
     [K in keyof T as T[K] extends never ? never : K]: T[K];
 };
@@ -50,7 +50,7 @@ export type _VovkClientFetcher<OPTS extends Record<string, KnownAny> = Record<st
     name: keyof T;
     httpMethod: HttpMethod;
     getEndpoint: (data: {
-        prefix: string;
+        apiRoot: string;
         params: {
             [key: string]: string;
         };
@@ -78,7 +78,7 @@ export interface _VovkDefaultFetcherOptions extends Omit<RequestInit, 'body' | '
     reactNative?: {
         textStreaming: boolean;
     };
-    prefix?: string;
+    apiRoot?: string;
     segmentName?: string;
     disableClientValidation?: boolean;
     validateOnClient?: _VovkValidateOnClient;

package/createDecorator.js

@@ -18,8 +18,8 @@ function _createDecorator(handler, initHandler) {
                 [propertyKey]: {
                     ...handlerSchema,
                     // avoid override of path and httpMethod
-                    ...(initResult?.clientValidators ? { clientValidators: initResult.clientValidators } : {}),
-                    ...(initResult?.customSchema ? { customSchema: initResult.customSchema } : {}),
+                    ...(initResult?.validation ? { validation: initResult.validation } : {}),
+                    ...(initResult?.custom ? { custom: initResult.custom } : {}),
                 },
             };
             const method = function method(req, params) {

package/{createSegment.d.ts → createVovkApp.d.ts}

@@ -1,5 +1,5 @@
-import { type _KnownAny as KnownAny, type _DecoratorOptions as DecoratorOptions, type _VovkRequest as VovkRequest } from './types';
-export declare function _createSegment(): {
+import { type _KnownAny as KnownAny, type _DecoratorOptions as DecoratorOptions, type _VovkRequest as VovkRequest, type _StaticClass as StaticClass } from './types';
+export declare function _createVovkApp(): {
     get: {
         (givenPath?: string | undefined, options?: DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
         auto: (options?: DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;
@@ -31,8 +31,8 @@ export declare function _createSegment(): {
     prefix: (givenPath?: string) => (givenTarget: KnownAny) => any;
     initVovk: (options: {
         segmentName?: string;
-        controllers: Record<string, Function>;
-        workers?: Record<string, Function>;
+        controllers: Record<string, StaticClass>;
+        workers?: Record<string, StaticClass>;
         exposeValidation?: boolean;
         emitSchema?: boolean;
         onError?: (err: Error, req: VovkRequest) => void | Promise<void>;

package/{createSegment.js → createVovkApp.js}

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._createSegment = _createSegment;
-/* eslint-disable no-console */
-const Segment_1 = require("./Segment");
+exports._createVovkApp = _createVovkApp;
+const VovkApp_1 = require("./VovkApp");
 const types_1 = require("./types");
 const getSchema_1 = __importDefault(require("./utils/getSchema"));
 const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
@@ -14,9 +13,9 @@ const toKebabCase = (str) => str
     .replace(/([A-Z])/g, '-$1')
     .toLowerCase()
     .replace(/^-/, '');
-function _createSegment() {
-    const segment = new Segment_1._Segment();
-    const getDecoratorCreator = (httpMethod) => {
+function _createVovkApp() {
+    const vovkApp = new VovkApp_1._VovkApp();
+    const createHTTPDecorator = (httpMethod) => {
         const assignSchema = (controller, propertyKey, path, options) => {
             if (typeof window !== 'undefined') {
                 throw new Error('Decorators are intended for server-side use only. You have probably imported a controller on the client-side.');
@@ -27,8 +26,8 @@ function _createSegment() {
                     decoratorName = 'del';
                 throw new Error(`Decorator must be used on a static class method. Check the controller method named "${propertyKey}" used with @${decoratorName}.`);
             }
-            const methods = segment._routes[httpMethod].get(controller) ?? {};
-            segment._routes[httpMethod].set(controller, methods);
+            const methods = vovkApp.routes[httpMethod].get(controller) ?? {};
+            vovkApp.routes[httpMethod].set(controller, methods);
             controller._handlers = {
                 ...controller._handlers,
                 [propertyKey]: {
@@ -54,8 +53,8 @@ function _createSegment() {
         const auto = (options) => {
             function decorator(givenTarget, propertyKey) {
                 const controller = givenTarget;
-                const methods = segment._routes[httpMethod].get(controller) ?? {};
-                segment._routes[httpMethod].set(controller, methods);
+                const methods = vovkApp.routes[httpMethod].get(controller) ?? {};
+                vovkApp.routes[httpMethod].set(controller, methods);
                 controller._handlers = {
                     ...controller._handlers,
                     [propertyKey]: {
@@ -76,7 +75,6 @@ function _createSegment() {
         return (givenTarget) => {
             const controller = givenTarget;
             controller._prefix = path;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return givenTarget;
         };
     };
@@ -92,28 +90,28 @@ function _createSegment() {
                 // 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 segment.respond(200, { schema });
+                return vovkApp.respond(200, { schema });
             }
-            return segment.GET(req, data);
+            return vovkApp.GET(req, data);
         }
         return {
-            GET: process.env.NODE_ENV === 'development' ? GET_DEV : segment.GET,
-            POST: segment.POST,
-            PUT: segment.PUT,
-            PATCH: segment.PATCH,
-            DELETE: segment.DELETE,
-            HEAD: segment.HEAD,
-            OPTIONS: segment.OPTIONS,
+            GET: process.env.NODE_ENV === 'development' ? GET_DEV : vovkApp.GET,
+            POST: vovkApp.POST,
+            PUT: vovkApp.PUT,
+            PATCH: vovkApp.PATCH,
+            DELETE: vovkApp.DELETE,
+            HEAD: vovkApp.HEAD,
+            OPTIONS: vovkApp.OPTIONS,
         };
     };
     return {
-        get: getDecoratorCreator(types_1._HttpMethod.GET),
-        post: getDecoratorCreator(types_1._HttpMethod.POST),
-        put: getDecoratorCreator(types_1._HttpMethod.PUT),
-        patch: getDecoratorCreator(types_1._HttpMethod.PATCH),
-        del: getDecoratorCreator(types_1._HttpMethod.DELETE),
-        head: getDecoratorCreator(types_1._HttpMethod.HEAD),
-        options: getDecoratorCreator(types_1._HttpMethod.OPTIONS),
+        get: createHTTPDecorator(types_1._HttpMethod.GET),
+        post: createHTTPDecorator(types_1._HttpMethod.POST),
+        put: createHTTPDecorator(types_1._HttpMethod.PUT),
+        patch: createHTTPDecorator(types_1._HttpMethod.PATCH),
+        del: createHTTPDecorator(types_1._HttpMethod.DELETE),
+        head: createHTTPDecorator(types_1._HttpMethod.HEAD),
+        options: createHTTPDecorator(types_1._HttpMethod.OPTIONS),
         prefix,
         initVovk,
     };

package/index.d.ts

@@ -1,12 +1,12 @@
-import { _createSegment as createSegment } from './createSegment';
-import { type _VovkErrorResponse as VovkErrorResponse, type _VovkRequest as VovkRequest, type _VovkControllerBody as VovkControllerBody, type _VovkControllerQuery as VovkControllerQuery, type _VovkControllerParams as VovkControllerParams, type _VovkControllerReturnType as VovkControllerReturnType, type _VovkControlerYieldType as VovkControlerYieldType, type _VovkBody as VovkBody, type _VovkQuery as VovkQuery, type _VovkParams as VovkParams, type _VovkReturnType as VovkReturnType, type _VovkYieldType as VovkYieldType, type _VovkSchema as VovkSchema, _HttpStatus as HttpStatus, _HttpMethod as HttpMethod } from './types';
+import { _createVovkApp as createVovkApp } from './createVovkApp';
+import { type _VovkErrorResponse as VovkErrorResponse, type _VovkRequest as VovkRequest, type _VovkBody as VovkBody, type _VovkQuery as VovkQuery, type _VovkParams as VovkParams, type _VovkReturnType as VovkReturnType, type _VovkYieldType as VovkYieldType, type _VovkControllerBody as VovkControllerBody, type _VovkControllerQuery as VovkControllerQuery, type _VovkControllerParams as VovkControllerParams, type _VovkControllerYieldType as VovkControllerYieldType, type _VovkSchema as VovkSchema, _HttpStatus as HttpStatus, _HttpMethod as HttpMethod } from './types';
 import type { _VovkClientOptions as VovkClientOptions, _VovkClientFetcher as VovkClientFetcher, _VovkDefaultFetcherOptions as VovkDefaultFetcherOptions, _VovkValidateOnClient as VovkValidateOnClient } from './client/types';
 import { _HttpException as HttpException } from './HttpException';
 import { _createDecorator as createDecorator } from './createDecorator';
-import { _StreamResponse as StreamResponse } from './StreamResponse';
+import { _StreamJSONResponse as StreamJSONResponse } from './StreamJSONResponse';
 import { worker } from './worker';
-import { _generateStaticAPI as generateStaticAPI } from './generateStaticAPI';
-export { type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerReturnType, type VovkControlerYieldType, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkClientOptions, StreamResponse, HttpException, HttpStatus, HttpMethod, createSegment, createDecorator, worker, generateStaticAPI, };
+import { _generateStaticAPI as generateStaticAPI } from './utils/generateStaticAPI';
+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, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, worker, generateStaticAPI, };
 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;
@@ -30,8 +30,8 @@ export declare const get: {
     auto: (options?: import("./types")._DecoratorOptions) => (givenTarget: import("./types")._KnownAny, propertyKey: string) => void;
 }, prefix: (givenPath?: string) => (givenTarget: import("./types")._KnownAny) => any, initVovk: (options: {
     segmentName?: string;
-    controllers: Record<string, Function>;
-    workers?: Record<string, Function>;
+    controllers: Record<string, import("./types")._StaticClass>;
+    workers?: Record<string, import("./types")._StaticClass>;
     exposeValidation?: boolean;
     emitSchema?: boolean;
     onError?: (err: Error, req: VovkRequest) => void | Promise<void>;

package/index.js

@@ -1,9 +1,9 @@
 "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.generateStaticAPI = exports.worker = exports.createDecorator = exports.createSegment = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.StreamResponse = void 0;
-const createSegment_1 = require("./createSegment");
-Object.defineProperty(exports, "createSegment", { enumerable: true, get: function () { return createSegment_1._createSegment; } });
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.generateStaticAPI = exports.worker = 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");
 Object.defineProperty(exports, "HttpStatus", { enumerable: true, get: function () { return types_1._HttpStatus; } });
 Object.defineProperty(exports, "HttpMethod", { enumerable: true, get: function () { return types_1._HttpMethod; } });
@@ -11,10 +11,10 @@ const HttpException_1 = require("./HttpException");
 Object.defineProperty(exports, "HttpException", { enumerable: true, get: function () { return HttpException_1._HttpException; } });
 const createDecorator_1 = require("./createDecorator");
 Object.defineProperty(exports, "createDecorator", { enumerable: true, get: function () { return createDecorator_1._createDecorator; } });
-const StreamResponse_1 = require("./StreamResponse");
-Object.defineProperty(exports, "StreamResponse", { enumerable: true, get: function () { return StreamResponse_1._StreamResponse; } });
+const StreamJSONResponse_1 = require("./StreamJSONResponse");
+Object.defineProperty(exports, "StreamJSONResponse", { enumerable: true, get: function () { return StreamJSONResponse_1._StreamJSONResponse; } });
 const worker_1 = require("./worker");
 Object.defineProperty(exports, "worker", { enumerable: true, get: function () { return worker_1.worker; } });
-const generateStaticAPI_1 = require("./generateStaticAPI");
+const generateStaticAPI_1 = require("./utils/generateStaticAPI");
 Object.defineProperty(exports, "generateStaticAPI", { enumerable: true, get: function () { return generateStaticAPI_1._generateStaticAPI; } });
-_a = (0, createSegment_1._createSegment)(), 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;
+_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/package.json

@@ -1,14 +1,15 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.3",
+  "version": "3.0.0-draft.31",
   "description": "RESTful RPC for Next.js - Transforms Next.js into a powerful REST API platform with RPC capabilities.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/finom/vovk.git"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc && cp {package.json,LICENSE,.npmignore} dist && cp ../../README.md dist",
+    "build": "shx rm -rf dist && tsc && shx cp package.json LICENSE .npmignore dist && shx cp ../../README.md dist",
     "lint": "eslint . --fix",
+    "tsc": "tsc --noEmit",
     "npm-publish": "if [ -z \"$NPM_TAG\" ]; then echo 'Error: NPM_TAG is not set'; exit 1; fi; cd ./dist && npm publish --tag=$NPM_TAG && cd ..",
     "ncu": "npm-check-updates -u"
   },

package/types.d.ts

@@ -1,7 +1,8 @@
 import type { NextRequest } from 'next/server';
-import type { _StreamResponse as StreamResponse } from './StreamResponse';
+import type { _StreamJSONResponse as StreamJSONResponse } from './StreamJSONResponse';
 import { _StreamAsyncIterator as StreamAsyncIterator } from './client/types';
 export type _KnownAny = any;
+export type _StaticClass = Function;
 export type _VovkSchema = {
     emitSchema: boolean;
     segmentName: string;
@@ -9,6 +10,7 @@ export type _VovkSchema = {
     controllers: Record<string, _VovkControllerSchema>;
 };
 export type _VovkErrorResponse = {
+    cause?: unknown;
     statusCode: _HttpStatus;
     message: string;
     isError: true;
@@ -16,33 +18,37 @@ export type _VovkErrorResponse = {
 export type _HandlerSchema = {
     path: string;
     httpMethod: _HttpMethod;
-    clientValidators?: {
+    validation?: {
         query?: _KnownAny;
         body?: _KnownAny;
     };
-    customSchema?: Record<string, _KnownAny>;
+    custom?: Record<string, _KnownAny>;
 };
 export type _VovkControllerSchema = {
-    _controllerName: string;
-    _originalControllerName: string;
-    _prefix?: string;
-    _handlers: Record<string, _HandlerSchema>;
+    controllerName: string;
+    originalControllerName: string;
+    prefix?: string;
+    handlers: Record<string, _HandlerSchema>;
 };
 export type _VovkWorkerSchema = {
-    _workerName: string;
-    _originalWorkerName: string;
-    _handlers: Record<string, {
+    workerName: string;
+    originalWorkerName: string;
+    handlers: Record<string, {
         isGenerator?: true;
     }>;
 };
-export type _VovkControllerInternal = _VovkControllerSchema & {
+export type _VovkControllerInternal = {
+    _controllerName?: _VovkControllerSchema['controllerName'];
+    _prefix?: _VovkControllerSchema['prefix'];
+    _handlers: _VovkControllerSchema['handlers'];
     _activated?: true;
     _onError?: (err: Error, req: _VovkRequest) => void | Promise<void>;
 };
-export type _VovkController = Function & _VovkControllerInternal & {
+export type _VovkController = _StaticClass & _VovkControllerInternal & {
     [key: string]: unknown;
 };
-export type _VovkWorker = Function & _VovkWorkerSchema & {
+export type _VovkWorker = _StaticClass & {
+    _handlers: _VovkWorkerSchema['handlers'];
     [key: string]: unknown;
 };
 export type _DecoratorOptions = {
@@ -62,49 +68,29 @@ export interface _VovkRequest<BODY = undefined, QUERY extends object | undefined
             forEach: (callbackfn: (value: QUERY[keyof QUERY], key: keyof QUERY, searchParams: NextRequest['nextUrl']['searchParams']) => void) => void;
             keys: () => IterableIterator<keyof QUERY>;
             values: () => IterableIterator<QUERY[keyof QUERY]>;
-            readonly __queryType: QUERY;
         };
     };
     vovk: {
         body: () => Promise<BODY>;
         query: () => QUERY;
         meta: <T = Record<_KnownAny, _KnownAny>>(meta?: T | null) => T;
+        form: <T = _KnownAny>() => Promise<T>;
     };
 }
-export type _ControllerStaticMethod<REQ extends _VovkRequest<undefined, _KnownAny> = _VovkRequest<undefined, Record<string, string | string[]>>, PARAMS extends {
+export type _ControllerStaticMethod<REQ extends _VovkRequest<_KnownAny, _KnownAny> = _VovkRequest<undefined, Record<string, string | string[]>>, PARAMS extends {
     [key: string]: string;
 } = _KnownAny> = ((req: REQ, params: PARAMS) => unknown) & {
     _controller?: _VovkController;
 };
-export type _VovkControllerBody<T extends _ControllerStaticMethod<REQ, PARAMS>, REQ extends _VovkRequest<undefined, _KnownAny> = Parameters<T>[0], PARAMS extends {
-    [key: string]: string;
-} = _KnownAny> = Awaited<ReturnType<Parameters<T>[0]['json']>>;
-export type _VovkControllerQuery<T extends _ControllerStaticMethod<REQ, PARAMS>, REQ extends _VovkRequest<undefined, _KnownAny> = Parameters<T>[0], PARAMS extends {
-    [key: string]: string;
-} = _KnownAny> = Parameters<T>[0]['nextUrl']['searchParams']['__queryType'];
-export type _VovkControllerParams<T extends _ControllerStaticMethod<REQ, PARAMS>, REQ extends _VovkRequest<undefined, _KnownAny> = Parameters<T>[0], PARAMS extends {
-    [key: string]: string;
-} = _KnownAny> = Parameters<T>[1];
-export type _VovkBody<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    body: B;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], B = _KnownAny> = Parameters<T>[0]['body'];
-export type _VovkQuery<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    query: Q;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], Q = _KnownAny> = Parameters<T>[0]['query'];
-export type _VovkParams<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    params: P;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], P = _KnownAny> = Parameters<T>[0]['params'];
-export type _VovkControllerReturnType<T extends _ControllerStaticMethod<REQ, PARAMS>, REQ extends _VovkRequest<undefined, _KnownAny> = Parameters<T>[0], PARAMS extends {
-    [key: string]: string;
-} = _KnownAny> = Awaited<ReturnType<T>>;
-export type _VovkControlerYieldType<T extends _ControllerStaticMethod<REQ, PARAMS>, REQ extends _VovkRequest<undefined, _KnownAny> = Parameters<T>[0], PARAMS extends {
-    [key: string]: string;
-} = _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<StreamResponse<infer Y>> | StreamResponse<infer Y> ? Y : never;
-export type _VovkReturnType<T extends (...args: _KnownAny) => unknown> = Awaited<ReturnType<T>>;
+export type _VovkControllerBody<T extends (...args: _KnownAny) => _KnownAny> = Awaited<ReturnType<Parameters<T>[0]['vovk']['body']>>;
+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];
+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<StreamJSONResponse<infer Y>> | StreamJSONResponse<infer Y> ? Y : never;
+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<StreamAsyncIterator<infer Y>> ? Y : never;
+export type _VovkReturnType<T extends (...args: _KnownAny) => unknown> = Awaited<ReturnType<T>>;
 export type _StreamAbortMessage = {
     isError: true;
     reason: _KnownAny;

package/utils/generateStaticAPI.d.ts

@@ -0,0 +1,4 @@
+import { _StaticClass as StaticClass } from '../types';
+export declare function _generateStaticAPI(c: Record<string, StaticClass>, slug?: string): {
+    [x: string]: string[];
+}[];

package/{generateStaticAPI.js → utils/generateStaticAPI.js}

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._generateStaticAPI = _generateStaticAPI;
-// eslint-disable-next-line @typescript-eslint/ban-types
 function _generateStaticAPI(c, slug = 'vovk') {
     const controllers = c;
     return [
-        { [slug]: ['_vovk-ping_'] },
+        { [slug]: ['_schema_'] },
         ...Object.values(controllers)
             .map((controller) => {
             const handlers = controller._handlers;

package/utils/getSchema.d.ts

@@ -1,8 +1,8 @@
-import { _VovkSchema as VovkSchema } from '../types';
-export default function (options: {
+import { _VovkSchema as VovkSchema, _StaticClass as StaticClass } from '../types';
+export default function getSchema(options: {
     emitSchema?: boolean;
     segmentName?: string;
-    controllers: Record<string, Function>;
-    workers?: Record<string, Function>;
+    controllers: Record<string, StaticClass>;
+    workers?: Record<string, StaticClass>;
     exposeValidation?: boolean;
 }): VovkSchema;

package/utils/getSchema.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-function default_1(options) {
+exports.default = getSchema;
+function getSchema(options) {
     const exposeValidation = options?.exposeValidation ?? true;
     const emitSchema = options.emitSchema ?? true;
     const schema = {
@@ -14,24 +14,24 @@ function default_1(options) {
         return schema;
     for (const [controllerName, controller] of Object.entries(options.controllers)) {
         schema.controllers[controllerName] = {
-            _controllerName: controllerName,
-            _originalControllerName: controller.name,
-            _prefix: controller._prefix ?? '',
-            _handlers: {
+            controllerName: controllerName,
+            originalControllerName: controller.name,
+            prefix: controller._prefix ?? '',
+            handlers: {
                 ...(exposeValidation
                     ? controller._handlers
-                    : Object.fromEntries(Object.entries(controller._handlers).map(([key, value]) => [
+                    : Object.fromEntries(Object.entries(controller._handlers ?? {}).map(([key, value]) => [
                         key,
-                        { ...value, clientValidators: undefined },
+                        { ...value, validation: undefined },
                     ]))),
             },
         };
     }
     for (const [workerName, worker] of Object.entries(options.workers ?? {})) {
         schema.workers[workerName] = {
-            _workerName: workerName,
-            _originalWorkerName: worker.name,
-            _handlers: { ...worker._handlers },
+            workerName,
+            originalWorkerName: worker.name,
+            handlers: { ...worker._handlers },
         };
     }
     return schema;

package/utils/reqForm.d.ts

@@ -0,0 +1,3 @@
+import { VovkRequest } from 'vovk';
+import { _KnownAny as KnownAny } from '../types';
+export default function reqForm<T = KnownAny>(req: VovkRequest<KnownAny, KnownAny>): Promise<T>;

package/utils/reqForm.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = reqForm;
+const formMap = new WeakMap();
+async function reqForm(req) {
+    if (formMap.has(req)) {
+        return formMap.get(req);
+    }
+    const body = await req.formData();
+    const formData = Object.fromEntries(body.entries());
+    formMap.set(req, formData);
+    return formData;
+}

package/utils/setClientValidatorsForHandler.d.ts

@@ -1,5 +1,5 @@
 import { _KnownAny as KnownAny } from '../types';
-export default function setClientValidatorsForHandler(h: (...args: KnownAny[]) => KnownAny, validators: {
+export default function setClientValidatorsForHandler(h: (...args: KnownAny[]) => KnownAny, validation: {
     body: unknown;
     query: unknown;
 }): Promise<void>;

package/utils/setClientValidatorsForHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = setClientValidatorsForHandler;
-function setClientValidatorsForHandler(h, validators) {
+function setClientValidatorsForHandler(h, validation) {
     return new Promise((resolve) => {
         setTimeout(() => {
             const controller = h._controller;
@@ -16,10 +16,7 @@ function setClientValidatorsForHandler(h, validators) {
                 ...controller._handlers,
                 [handlerName]: {
                     ...controller._handlers[handlerName],
-                    clientValidators: {
-                        body: validators.body,
-                        query: validators.query,
-                    },
+                    validation,
                 },
             };
             resolve();

package/worker/promisifyWorker.d.ts

@@ -1,2 +1,2 @@
 import type { _WorkerPromiseInstance as WorkerPromiseInstance } from './types';
-export declare function _promisifyWorker<T extends object>(currentWorker: Worker | null, givenWorkerService: object): WorkerPromiseInstance<T>;
+export declare function _promisifyWorker<T extends object>(currentWorker: Worker | null, workerSchema: object): WorkerPromiseInstance<T>;

package/worker/promisifyWorker.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._promisifyWorker = _promisifyWorker;
-function _promisifyWorker(currentWorker, givenWorkerService) {
-    if (!givenWorkerService)
+function _promisifyWorker(currentWorker, workerSchema) {
+    if (!workerSchema)
         throw new Error('Worker schema is not provided');
-    const workerService = givenWorkerService;
+    const schema = workerSchema;
     const instance = {
         worker: currentWorker,
     };
@@ -23,15 +23,11 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
         instance.worker = worker;
         return instance;
     };
-    instance.fork = (worker) => {
-        return _promisifyWorker(worker, givenWorkerService);
-    };
-    for (const method of Object.keys(workerService._handlers)) {
-        const { isGenerator } = workerService._handlers[method];
-        const value = workerService[method];
+    instance.fork = (worker) => _promisifyWorker(worker, schema);
+    for (const methodName of Object.keys(schema.handlers)) {
+        const { isGenerator } = schema.handlers[methodName];
         if (isGenerator) {
-            // @ts-expect-error TODO Fix this
-            instance[method] = (...args) => {
+            const method = (...args) => {
                 const key = callsKey;
                 callsKey += 1;
                 return {
@@ -43,8 +39,8 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
                         const messageQueue = [];
                         let messageResolver = null;
                         const onMessage = (e) => {
-                            const { method: m, key: k } = e.data;
-                            if (k !== key || m !== method) {
+                            const { methodName: m, key: k } = e.data;
+                            if (k !== key || m !== methodName) {
                                 return;
                             }
                             if (messageResolver) {
@@ -69,7 +65,7 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
                         };
                         w.addEventListener('message', onMessage);
                         w.addEventListener('error', onError);
-                        w.postMessage({ key, args, method });
+                        w.postMessage({ key, args, methodName });
                         try {
                             while (true) {
                                 let message = null;
@@ -101,10 +97,11 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
                     },
                 };
             };
+            // @ts-expect-error TODO
+            instance[methodName] = method;
         }
         else {
-            // @ts-expect-error TODO Fix this
-            instance[method] = (...args) => {
+            const method = (...args) => {
                 if (!instance.worker) {
                     throw new Error('Worker is not provided or terminated');
                 }
@@ -118,8 +115,8 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
                         reject(e);
                     };
                     const onMessage = (e) => {
-                        const { result, error, key: k, method: m } = e.data;
-                        if (k !== key || m !== method) {
+                        const { result, error, key: k, methodName: m } = e.data;
+                        if (k !== key || m !== methodName) {
                             return;
                         }
                         w.removeEventListener('message', onMessage);
@@ -133,9 +130,11 @@ function _promisifyWorker(currentWorker, givenWorkerService) {
                     };
                     w.addEventListener('message', onMessage);
                     w.addEventListener('error', onError);
-                    w.postMessage({ key, args, method });
+                    w.postMessage({ key, args, methodName });
                 });
             };
+            // @ts-expect-error TODO
+            instance[methodName] = method;
         }
     }
     return instance;

package/worker/types.d.ts

@@ -17,15 +17,15 @@ export type _WorkerPromiseInstance<T> = OmitNever<_WorkerPromiseInstanceWithNeve
     [Symbol.dispose]: () => void;
 };
 export interface _WorkerInput {
-    method: string;
+    methodName: string;
     args: unknown[];
     key: number;
 }
 export interface _WorkerOutput {
+    methodName: string;
     result?: unknown;
     error?: unknown;
     done?: true;
     key: number;
-    method: string;
 }
 export {};

package/worker/worker.js

@@ -5,7 +5,6 @@ function _worker() {
     return (t) => {
         const target = t;
         target._handlers = {};
-        // TODO: Experimental: You can pass Worker Service instead of schema to prommisify worker
         for (const key of Object.getOwnPropertyNames(target)) {
             const member = target[key];
             if (typeof member === 'function') {
@@ -20,25 +19,24 @@ function _worker() {
         }
         if (typeof self === 'undefined')
             return; // no-op in non-worker environment
-        // eslint-disable-next-line no-undef
         const w = self;
         w.onmessage = async (evt) => {
-            const { method, args, key } = evt.data;
+            const { methodName, args, key } = evt.data;
             try {
-                const result = await target[method](...args);
+                const result = await target[methodName](...args);
                 if (result && typeof result === 'object' && 'next' in result && typeof result.next === 'function') {
                     const iterable = result;
                     for await (const result of iterable) {
-                        w.postMessage({ result, key, method });
+                        w.postMessage({ result, key, methodName });
                     }
-                    w.postMessage({ done: true, key, method });
+                    w.postMessage({ done: true, key, methodName });
                 }
                 else {
-                    w.postMessage({ result, key, method });
+                    w.postMessage({ result, key, methodName });
                 }
             }
             catch (e) {
-                w.postMessage({ error: e, key, method });
+                w.postMessage({ error: e, key, methodName });
             }
         };
     };

package/generateStaticAPI.d.ts

@@ -1,3 +0,0 @@
-export declare function _generateStaticAPI(c: Record<string, Function>, slug?: string): {
-    [x: string]: string[];
-}[];