vovk 3.0.0-draft.56 → 3.0.0-draft.58

package/dist/StreamJSONResponse.d.ts

@@ -3,7 +3,6 @@ import './utils/shim';
 export declare class StreamJSONResponse<T> extends Response {
     static defaultHeaders: {
         'content-type': string;
-        'x-vovk-stream': string;
     };
     isClosed: boolean;
     controller?: ReadableStreamDefaultController;

package/dist/StreamJSONResponse.js

@@ -4,8 +4,7 @@ exports.StreamJSONResponse = void 0;
 require("./utils/shim");
 class StreamJSONResponse extends Response {
     static defaultHeaders = {
-        'content-type': 'text/plain; charset=utf-8',
-        'x-vovk-stream': 'true',
+        'content-type': 'application/jsonl',
     };
     isClosed = false;
     controller;

package/dist/client/createRPC.d.ts

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

package/dist/client/createRPC.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRPC = void 0;
 const defaultFetcher_1 = __importDefault(require("./defaultFetcher"));
 const defaultHandler_1 = require("./defaultHandler");
 const defaultStreamHandler_1 = require("./defaultStreamHandler");
@@ -67,9 +66,10 @@ const createRPC = (controllerSchema, segmentName, options) => {
             return input.transform ? fetcherPromise.then(input.transform) : fetcherPromise;
         };
         handler.schema = handlerSchema;
+        handler.controllerSchema = schema;
         // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }
     return client;
 };
-exports.createRPC = createRPC;
+exports.default = createRPC;

package/dist/client/defaultFetcher.js

@@ -38,12 +38,13 @@ const defaultFetcher = async ({ httpMethod, getEndpoint, validate, defaultHandle
         // handle network errors
         throw new HttpException_1.HttpException(types_1.HttpStatus.NULL, e?.message ?? exports.DEFAULT_ERROR_MESSAGE);
     }
-    if (response.headers.get('content-type')?.includes('application/json')) {
-        return defaultHandler(response);
-    }
-    if (response.headers.get('x-vovk-stream') === 'true') {
+    const contentType = response.headers.get('content-type');
+    if (contentType?.includes('application/jsonl')) {
         return defaultStreamHandler(response);
     }
+    if (contentType?.includes('application/json')) {
+        return defaultHandler(response);
+    }
     return response;
 };
 exports.default = defaultFetcher;

package/dist/client/index.d.ts

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

package/dist/client/index.js

@@ -1,5 +1,8 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPC = void 0;
 var createRPC_1 = require("./createRPC");
-Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return createRPC_1.createRPC; } });
+Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return __importDefault(createRPC_1).default; } });

package/dist/client/types.d.ts

@@ -1,4 +1,4 @@
-import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkControllerBody, VovkControllerQuery, VovkControllerParams, VovkHandlerSchema } from '../types';
+import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkControllerBody, VovkControllerQuery, VovkControllerParams, VovkHandlerSchema, VovkControllerSchema } from '../types';
 import type { StreamJSONResponse } from '../StreamJSONResponse';
 import type { NextResponse } from 'next/server';
 export type StaticMethodInput<T extends ControllerStaticMethod> = (VovkControllerBody<T> extends undefined | void ? {
@@ -36,6 +36,7 @@ type ClientMethod<T extends (...args: KnownAny[]) => void | object | StreamJSONR
     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>) & {
     schema: VovkHandlerSchema;
+    controllerSchema: VovkControllerSchema;
 };
 type OmitNever<T> = {
     [K in keyof T as T[K] extends never ? never : K]: T[K];

package/dist/createVovkApp.d.ts

@@ -32,7 +32,6 @@ export declare function createVovkApp(): {
     initVovk: (options: {
         segmentName?: string;
         controllers: Record<string, StaticClass>;
-        workers?: Record<string, StaticClass>;
         exposeValidation?: boolean;
         emitSchema?: boolean;
         onError?: (err: Error, req: VovkRequest) => void | Promise<void>;

package/dist/createVovkApp.js

@@ -31,7 +31,6 @@ function createVovkApp() {
             controller._handlers = {
                 ...controller._handlers,
                 [propertyKey]: {
-                    validation: {},
                     ...(controller._handlers ?? {})[propertyKey],
                     path,
                     httpMethod,

package/dist/index.d.ts

@@ -1,38 +1,36 @@
 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, type VovkHandlerSchema } from './types';
-import { type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, createRPC } from './client';
+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 VovkSchema, type VovkControllerSchema, type VovkHandlerSchema } from './types';
+import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, createRPC } from './client';
 import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
 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, type VovkHandlerSchema, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, worker, createWPC, createRPC, generateStaticAPI, setClientValidatorsForHandler, };
+export { type KnownAny, type VovkClient, 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 VovkControllerSchema, type VovkHandlerSchema, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, 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;
+    (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;
 }, post: {
-    (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;
+    (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;
 }, put: {
-    (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;
+    (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;
 }, patch: {
-    (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;
+    (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;
 }, del: {
-    (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;
+    (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;
 }, head: {
-    (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;
+    (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;
 }, options: {
-    (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;
-}, prefix: (givenPath?: string) => (givenTarget: import("./types").KnownAny) => any, initVovk: (options: {
+    (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;
+}, prefix: (givenPath?: string) => (givenTarget: KnownAny) => any, initVovk: (options: {
     segmentName?: string;
     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/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.setClientValidatorsForHandler = exports.generateStaticAPI = exports.createRPC = exports.createWPC = exports.worker = 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.setClientValidatorsForHandler = exports.generateStaticAPI = 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");
@@ -15,9 +15,6 @@ const createDecorator_1 = require("./createDecorator");
 Object.defineProperty(exports, "createDecorator", { enumerable: true, get: function () { return createDecorator_1.createDecorator; } });
 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; } });
-Object.defineProperty(exports, "createWPC", { enumerable: true, get: function () { return worker_1.createWPC; } });
 const generateStaticAPI_1 = require("./utils/generateStaticAPI");
 Object.defineProperty(exports, "generateStaticAPI", { enumerable: true, get: function () { return generateStaticAPI_1.generateStaticAPI; } });
 const setClientValidatorsForHandler_1 = require("./utils/setClientValidatorsForHandler");

package/dist/types.d.ts

@@ -6,7 +6,7 @@ export type StaticClass = Function;
 export type VovkHandlerSchema = {
     path: string;
     httpMethod: HttpMethod;
-    validation: {
+    validation?: {
         query?: KnownAny;
         body?: KnownAny;
     };
@@ -18,17 +18,9 @@ export type VovkControllerSchema = {
     prefix?: string;
     handlers: Record<string, VovkHandlerSchema>;
 };
-export type VovkWorkerSchema = {
-    workerName: string;
-    originalWorkerName: string;
-    handlers: Record<string, {
-        isGenerator?: true;
-    }>;
-};
 export type VovkSchema = {
     emitSchema: boolean;
     segmentName: string;
-    workers: Record<string, VovkWorkerSchema>;
     controllers: Record<string, VovkControllerSchema>;
 };
 export type VovkErrorResponse = {
@@ -47,10 +39,6 @@ export type VovkControllerInternal = {
 export type VovkController = StaticClass & VovkControllerInternal & {
     [key: string]: unknown;
 };
-export type VovkWorker = StaticClass & {
-    _handlers: VovkWorkerSchema['handlers'];
-    [key: string]: unknown;
-};
 export type DecoratorOptions = {
     cors?: boolean;
     headers?: Record<string, string>;

package/dist/utils/getSchema.d.ts

@@ -3,6 +3,5 @@ export default function getSchema(options: {
     emitSchema?: boolean;
     segmentName?: string;
     controllers: Record<string, StaticClass>;
-    workers?: Record<string, StaticClass>;
     exposeValidation?: boolean;
 }): VovkSchema;

package/dist/utils/getSchema.js

@@ -8,7 +8,6 @@ function getSchema(options) {
         emitSchema,
         segmentName: options.segmentName ?? '',
         controllers: {},
-        workers: {},
     };
     if (!emitSchema)
         return schema;
@@ -24,12 +23,5 @@ function getSchema(options) {
             },
         };
     }
-    for (const [workerName, worker] of Object.entries(options.workers ?? {})) {
-        schema.workers[workerName] = {
-            workerName,
-            originalWorkerName: worker.name,
-            handlers: { ...worker._handlers },
-        };
-    }
     return schema;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.56",
+  "version": "3.0.0-draft.58",
   "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/StreamJSONResponse.ts

@@ -3,8 +3,7 @@ import './utils/shim';
 
 export class StreamJSONResponse<T> extends Response {
   public static defaultHeaders = {
-    'content-type': 'text/plain; charset=utf-8',
-    'x-vovk-stream': 'true',
+    'content-type': 'application/jsonl',
   };
 
   public isClosed = false;

package/src/client/createRPC.ts

@@ -29,7 +29,7 @@ const getHandlerPath = <T extends ControllerStaticMethod>(
   return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
 
-export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(
+const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(
   controllerSchema: VovkControllerSchema,
   segmentName?: string,
   options?: VovkClientOptions<OPTS>
@@ -107,6 +107,7 @@ export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefault
     };
 
     handler.schema = handlerSchema;
+    handler.controllerSchema = schema;
 
     // @ts-expect-error TODO
     client[staticMethodName] = handler;
@@ -114,3 +115,5 @@ export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefault
 
   return client;
 };
+
+export default createRPC;

package/src/client/defaultFetcher.ts

@@ -43,14 +43,16 @@ const defaultFetcher: VovkClientFetcher<VovkDefaultFetcherOptions> = async (
     throw new HttpException(HttpStatus.NULL, (e as Error)?.message ?? DEFAULT_ERROR_MESSAGE);
   }
 
-  if (response.headers.get('content-type')?.includes('application/json')) {
-    return defaultHandler(response);
-  }
+  const contentType = response.headers.get('content-type');
 
-  if (response.headers.get('x-vovk-stream') === 'true') {
+  if (contentType?.includes('application/jsonl')) {
     return defaultStreamHandler(response);
   }
 
+  if (contentType?.includes('application/json')) {
+    return defaultHandler(response);
+  }
+
   return response;
 };
 

package/src/client/index.ts

@@ -1,2 +1,8 @@
-export { createRPC } from './createRPC';
-export type { VovkClientFetcher, VovkClientOptions, VovkDefaultFetcherOptions, VovkValidateOnClient } from './types';
+export { default as createRPC } from './createRPC';
+export type {
+  VovkClient,
+  VovkClientFetcher,
+  VovkClientOptions,
+  VovkDefaultFetcherOptions,
+  VovkValidateOnClient,
+} from './types';

package/src/client/types.ts

@@ -6,6 +6,7 @@ import type {
   VovkControllerQuery,
   VovkControllerParams,
   VovkHandlerSchema,
+  VovkControllerSchema,
 } from '../types';
 import type { StreamJSONResponse } from '../StreamJSONResponse';
 import type { NextResponse } from 'next/server';
@@ -64,6 +65,7 @@ type ClientMethod<
     ? Promise<R>
     : StaticMethodReturnPromise<T>) & {
   schema: VovkHandlerSchema;
+  controllerSchema: VovkControllerSchema;
 };
 
 type OmitNever<T> = {

package/src/createVovkApp.ts

@@ -48,7 +48,6 @@ export function createVovkApp() {
       controller._handlers = {
         ...controller._handlers,
         [propertyKey]: {
-          validation: {},
           ...((controller._handlers ?? {})[propertyKey] as Partial<VovkHandlerSchema>),
           path,
           httpMethod,
@@ -122,7 +121,6 @@ export function createVovkApp() {
   const initVovk = (options: {
     segmentName?: string;
     controllers: Record<string, StaticClass>;
-    workers?: Record<string, StaticClass>;
     exposeValidation?: boolean;
     emitSchema?: boolean;
     onError?: (err: Error, req: VovkRequest) => void | Promise<void>;

package/src/index.ts

@@ -2,6 +2,7 @@ import { createVovkApp } from './createVovkApp';
 import {
   HttpStatus as HttpStatus,
   HttpMethod as HttpMethod,
+  type KnownAny,
   type VovkErrorResponse,
   type VovkRequest,
   type VovkBody,
@@ -14,11 +15,11 @@ import {
   type VovkControllerParams,
   type VovkControllerYieldType,
   type VovkSchema,
-  type VovkWorkerSchema,
   type VovkControllerSchema,
   type VovkHandlerSchema,
 } from './types';
 import {
+  type VovkClient,
   type VovkClientOptions,
   type VovkClientFetcher,
   type VovkDefaultFetcherOptions,
@@ -28,11 +29,12 @@ import {
 import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
 import { StreamJSONResponse } from './StreamJSONResponse';
-import { worker, createWPC } from './worker';
 import { generateStaticAPI } from './utils/generateStaticAPI';
 import { setClientValidatorsForHandler } from './utils/setClientValidatorsForHandler';
 
 export {
+  type KnownAny,
+  type VovkClient,
   type VovkClientFetcher,
   type VovkDefaultFetcherOptions,
   type VovkValidateOnClient,
@@ -49,7 +51,6 @@ export {
   type VovkYieldType,
   type VovkReturnType,
   type VovkClientOptions,
-  type VovkWorkerSchema,
   type VovkControllerSchema,
   type VovkHandlerSchema,
   StreamJSONResponse,
@@ -58,8 +59,6 @@ export {
   HttpMethod,
   createVovkApp,
   createDecorator,
-  worker,
-  createWPC,
   createRPC,
   generateStaticAPI,
   setClientValidatorsForHandler,

package/src/types.ts

@@ -9,7 +9,7 @@ export type StaticClass = Function; // eslint-disable-line @typescript-eslint/no
 export type VovkHandlerSchema = {
   path: string;
   httpMethod: HttpMethod;
-  validation: { query?: KnownAny; body?: KnownAny };
+  validation?: { query?: KnownAny; body?: KnownAny };
   custom?: Record<string, KnownAny>;
 };
 
@@ -20,21 +20,9 @@ export type VovkControllerSchema = {
   handlers: Record<string, VovkHandlerSchema>;
 };
 
-export type VovkWorkerSchema = {
-  workerName: string;
-  originalWorkerName: string;
-  handlers: Record<
-    string,
-    {
-      isGenerator?: true;
-    }
-  >;
-};
-
 export type VovkSchema = {
   emitSchema: boolean;
   segmentName: string;
-  workers: Record<string, VovkWorkerSchema>;
   controllers: Record<string, VovkControllerSchema>;
 };
 
@@ -58,11 +46,6 @@ export type VovkController = StaticClass &
     [key: string]: unknown;
   };
 
-export type VovkWorker = StaticClass & {
-  _handlers: VovkWorkerSchema['handlers'];
-  [key: string]: unknown;
-};
-
 export type DecoratorOptions = {
   cors?: boolean;
   headers?: Record<string, string>;

package/src/utils/getSchema.ts

@@ -1,10 +1,9 @@
-import type { VovkSchema, VovkController, VovkWorker, StaticClass } from '../types';
+import type { VovkSchema, VovkController, StaticClass } from '../types';
 
 export default function getSchema(options: {
   emitSchema?: boolean;
   segmentName?: string;
   controllers: Record<string, StaticClass>;
-  workers?: Record<string, StaticClass>;
   exposeValidation?: boolean;
 }) {
   const exposeValidation = options?.exposeValidation ?? true;
@@ -13,7 +12,6 @@ export default function getSchema(options: {
     emitSchema,
     segmentName: options.segmentName ?? '',
     controllers: {},
-    workers: {},
   };
 
   if (!emitSchema) return schema;
@@ -33,13 +31,5 @@ export default function getSchema(options: {
     };
   }
 
-  for (const [workerName, worker] of Object.entries(options.workers ?? {}) as [string, VovkWorker][]) {
-    schema.workers[workerName] = {
-      workerName,
-      originalWorkerName: worker.name,
-      handlers: { ...worker._handlers },
-    };
-  }
-
   return schema;
 }

package/.npmignore

@@ -1,3 +0,0 @@
-!*
-tsconfig.*
-eslint.config.js

package/.turbo/turbo-build.log

@@ -1,6 +0,0 @@
-
-
-> vovk@3.0.0-draft.56 build
-> tsc
-
-\

package/.turbo/turbo-ncu.log

@@ -1,9 +0,0 @@
-
-
-> vovk@3.0.0-draft.49 ncu
-> npm-check-updates -u
-
-Upgrading /Users/andriigubanov/Work/vovk/packages/vovk/package.json
-
-No dependencies.
-\

package/.turbo/turbo-tsc.log

@@ -1,6 +0,0 @@
-
-
-> vovk@3.0.0-draft.55 tsc
-> tsc --noEmit
-
-\

package/dist/worker/createWPC.d.ts

@@ -1,2 +0,0 @@
-import type { WorkerPromiseInstance } from './types';
-export declare function createWPC<T extends object>(workerSchema: object, currentWorker?: Worker): WorkerPromiseInstance<T>;

package/dist/worker/createWPC.js

@@ -1,141 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWPC = createWPC;
-function createWPC(workerSchema, currentWorker) {
-    if (!workerSchema)
-        throw new Error('Worker schema is not provided');
-    const schema = workerSchema;
-    const instance = {
-        worker: currentWorker,
-    };
-    let callsKey = 0;
-    instance.terminate = () => {
-        if (instance._isTerminated)
-            return;
-        instance._isTerminated = true;
-        instance.worker?.terminate();
-        instance.worker = null;
-    };
-    instance.employ = (worker) => {
-        if (instance._isTerminated)
-            return instance;
-        instance._isTerminated = true;
-        instance.worker = worker;
-        return instance;
-    };
-    instance.fork = (worker) => createWPC(schema, worker);
-    for (const methodName of Object.keys(schema.handlers)) {
-        const { isGenerator } = schema.handlers[methodName];
-        if (isGenerator) {
-            const method = (...args) => {
-                const key = callsKey;
-                callsKey += 1;
-                return {
-                    async *[Symbol.asyncIterator]() {
-                        if (!instance.worker) {
-                            throw new Error('Worker is not provided or terminated');
-                        }
-                        const w = instance.worker;
-                        const messageQueue = [];
-                        let messageResolver = null;
-                        const onMessage = (e) => {
-                            const { methodName: m, key: k } = e.data;
-                            if (k !== key || m !== methodName) {
-                                return;
-                            }
-                            if (messageResolver) {
-                                messageResolver(e.data);
-                                messageResolver = null;
-                            }
-                            else {
-                                messageQueue.push(e.data);
-                            }
-                        };
-                        const onError = (e) => {
-                            if (messageResolver) {
-                                messageResolver({ error: e.error });
-                                messageResolver = null;
-                            }
-                            else {
-                                messageQueue.push({ error: e.error });
-                            }
-                            w.removeEventListener('message', onMessage);
-                            w.removeEventListener('error', onError);
-                            throw e.error;
-                        };
-                        w.addEventListener('message', onMessage);
-                        w.addEventListener('error', onError);
-                        w.postMessage({ key, args, methodName });
-                        try {
-                            while (true) {
-                                let message = null;
-                                if (messageQueue.length > 0) {
-                                    message = messageQueue.shift();
-                                }
-                                else {
-                                    message = await new Promise((resolve) => {
-                                        messageResolver = resolve;
-                                    });
-                                }
-                                const { result, error, done } = message;
-                                if (error) {
-                                    throw error;
-                                }
-                                if (done) {
-                                    break;
-                                }
-                                yield result;
-                            }
-                            w.removeEventListener('message', onMessage);
-                            w.removeEventListener('error', onError);
-                        }
-                        catch (e) {
-                            w.removeEventListener('message', onMessage);
-                            w.removeEventListener('error', onError);
-                            throw e;
-                        }
-                    },
-                };
-            };
-            // @ts-expect-error TODO
-            instance[methodName] = method;
-        }
-        else {
-            const method = (...args) => {
-                if (!instance.worker) {
-                    throw new Error('Worker is not provided or terminated');
-                }
-                const w = instance.worker;
-                return new Promise((resolve, reject) => {
-                    const key = callsKey;
-                    callsKey += 1;
-                    const onError = (e) => {
-                        w.removeEventListener('message', onMessage);
-                        w.removeEventListener('error', onError);
-                        reject(e);
-                    };
-                    const onMessage = (e) => {
-                        const { result, error, key: k, methodName: m } = e.data;
-                        if (k !== key || m !== methodName) {
-                            return;
-                        }
-                        w.removeEventListener('message', onMessage);
-                        w.removeEventListener('error', onError);
-                        if (error) {
-                            reject(error);
-                        }
-                        else {
-                            resolve(result);
-                        }
-                    };
-                    w.addEventListener('message', onMessage);
-                    w.addEventListener('error', onError);
-                    w.postMessage({ key, args, methodName });
-                });
-            };
-            // @ts-expect-error TODO
-            instance[methodName] = method;
-        }
-    }
-    return instance;
-}

package/dist/worker/index.d.ts

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

package/dist/worker/index.js

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

package/dist/worker/types.d.ts

@@ -1,31 +0,0 @@
-import type { KnownAny } from '../types';
-type ToPromise<T> = T extends PromiseLike<unknown> ? T : Promise<T>;
-type ToAsyncGenerator<T> = T extends AsyncGenerator<unknown, unknown, unknown> ? T : T extends Generator<infer U, unknown, unknown> ? AsyncGenerator<U, unknown, unknown> : AsyncGenerator<T, unknown, unknown>;
-type ToProperReturnType<T> = T extends Generator<unknown, unknown, unknown> | AsyncGenerator<unknown, unknown, unknown> ? ToAsyncGenerator<T> : ToPromise<T>;
-type OmitNever<T> = {
-    [K in keyof T as T[K] extends never ? never : K]: T[K];
-};
-export type WorkerPromiseInstanceWithNever<T> = {
-    [K in keyof T]: T[K] extends (...args: KnownAny[]) => KnownAny ? (...args: Parameters<T[K]>) => ToProperReturnType<ReturnType<T[K]>> : never;
-};
-export type WorkerPromiseInstance<T> = OmitNever<WorkerPromiseInstanceWithNever<T>> & {
-    terminate: () => void;
-    employ: (w: Worker) => WorkerPromiseInstance<T>;
-    fork: (w: Worker) => WorkerPromiseInstance<T>;
-    worker: Worker | null;
-    _isTerminated?: true;
-    [Symbol.dispose]: () => void;
-};
-export interface WorkerInput {
-    methodName: string;
-    args: unknown[];
-    key: number;
-}
-export interface WorkerOutput {
-    methodName: string;
-    result?: unknown;
-    error?: unknown;
-    done?: true;
-    key: number;
-}
-export {};

package/dist/worker/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/worker/worker.d.ts

@@ -1 +0,0 @@
-export declare function worker(): (t: object) => void;

package/dist/worker/worker.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.worker = worker;
-function worker() {
-    return (t) => {
-        const target = t;
-        target._handlers = {};
-        for (const key of Object.getOwnPropertyNames(target)) {
-            const member = target[key];
-            if (typeof member === 'function') {
-                const prototype = Object.getPrototypeOf(member);
-                const isGenerator = prototype === Object.getPrototypeOf(function* () { }) ||
-                    prototype === Object.getPrototypeOf(async function* () { });
-                target._handlers[key] = {};
-                if (isGenerator) {
-                    target._handlers[key].isGenerator = true;
-                }
-            }
-        }
-        if (typeof self === 'undefined')
-            return; // no-op in non-worker environment
-        const w = self;
-        w.onmessage = async (evt) => {
-            const { methodName, args, key } = evt.data;
-            try {
-                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, methodName });
-                    }
-                    w.postMessage({ done: true, key, methodName });
-                }
-                else {
-                    w.postMessage({ result, key, methodName });
-                }
-            }
-            catch (e) {
-                w.postMessage({ error: e, key, methodName });
-            }
-        };
-    };
-}

package/src/worker/createWPC.ts

@@ -1,153 +0,0 @@
-import type { VovkWorkerSchema } from '../types';
-import type { WorkerInput, WorkerOutput, WorkerPromiseInstance } from './types';
-
-export function createWPC<T extends object>(workerSchema: object, currentWorker?: Worker): WorkerPromiseInstance<T> {
-  if (!workerSchema) throw new Error('Worker schema is not provided');
-  const schema = workerSchema as T & VovkWorkerSchema;
-  const instance = {
-    worker: currentWorker,
-  } as WorkerPromiseInstance<T>;
-  let callsKey = 0;
-
-  instance.terminate = () => {
-    if (instance._isTerminated) return;
-    instance._isTerminated = true;
-    instance.worker?.terminate();
-    instance.worker = null;
-  };
-
-  instance.employ = (worker: Worker) => {
-    if (instance._isTerminated) return instance;
-    instance._isTerminated = true;
-    instance.worker = worker;
-    return instance;
-  };
-
-  instance.fork = (worker: Worker) => createWPC<T>(schema, worker);
-
-  for (const methodName of Object.keys(schema.handlers) as (keyof T & string)[]) {
-    const { isGenerator } = schema.handlers[methodName];
-
-    if (isGenerator) {
-      const method = (...args: unknown[]) => {
-        const key = callsKey;
-        callsKey += 1;
-        return {
-          async *[Symbol.asyncIterator]() {
-            if (!instance.worker) {
-              throw new Error('Worker is not provided or terminated');
-            }
-            const w = instance.worker;
-            const messageQueue: WorkerOutput[] = [];
-            let messageResolver: ((message: WorkerOutput) => void) | null = null;
-
-            const onMessage = (e: MessageEvent<WorkerOutput>) => {
-              const { methodName: m, key: k } = e.data;
-              if (k !== key || m !== methodName) {
-                return;
-              }
-              if (messageResolver) {
-                messageResolver(e.data);
-                messageResolver = null;
-              } else {
-                messageQueue.push(e.data);
-              }
-            };
-
-            const onError = (e: ErrorEvent) => {
-              if (messageResolver) {
-                messageResolver({ error: e.error } as WorkerOutput);
-                messageResolver = null;
-              } else {
-                messageQueue.push({ error: e.error } as WorkerOutput);
-              }
-
-              w.removeEventListener('message', onMessage);
-              w.removeEventListener('error', onError);
-              throw e.error;
-            };
-
-            w.addEventListener('message', onMessage);
-            w.addEventListener('error', onError);
-
-            w.postMessage({ key, args, methodName } satisfies WorkerInput);
-
-            try {
-              while (true) {
-                let message: WorkerOutput | null = null;
-                if (messageQueue.length > 0) {
-                  message = messageQueue.shift()!;
-                } else {
-                  message = await new Promise<WorkerOutput>((resolve) => {
-                    messageResolver = resolve;
-                  });
-                }
-
-                const { result, error, done } = message;
-
-                if (error) {
-                  throw error;
-                }
-
-                if (done) {
-                  break;
-                }
-
-                yield result;
-              }
-
-              w.removeEventListener('message', onMessage);
-              w.removeEventListener('error', onError);
-            } catch (e) {
-              w.removeEventListener('message', onMessage);
-              w.removeEventListener('error', onError);
-              throw e;
-            }
-          },
-        };
-      };
-
-      // @ts-expect-error TODO
-      instance[methodName] = method;
-    } else {
-      const method = (...args: unknown[]) => {
-        if (!instance.worker) {
-          throw new Error('Worker is not provided or terminated');
-        }
-        const w = instance.worker;
-        return new Promise((resolve, reject) => {
-          const key = callsKey;
-          callsKey += 1;
-
-          const onError = (e: ErrorEvent) => {
-            w.removeEventListener('message', onMessage);
-            w.removeEventListener('error', onError);
-            reject(e);
-          };
-
-          const onMessage = (e: MessageEvent<WorkerOutput>) => {
-            const { result, error, key: k, methodName: m } = e.data;
-            if (k !== key || m !== methodName) {
-              return;
-            }
-            w.removeEventListener('message', onMessage);
-            w.removeEventListener('error', onError);
-            if (error) {
-              reject(error);
-            } else {
-              resolve(result);
-            }
-          };
-
-          w.addEventListener('message', onMessage);
-          w.addEventListener('error', onError);
-          w.postMessage({ key, args, methodName } satisfies WorkerInput);
-        });
-      };
-
-      // @ts-expect-error TODO
-      instance[methodName] = method;
-    }
-  }
-  return instance;
-}

package/src/worker/index.ts

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

package/src/worker/types.ts

@@ -1,45 +0,0 @@
-import type { KnownAny } from '../types';
-
-type ToPromise<T> = T extends PromiseLike<unknown> ? T : Promise<T>;
-type ToAsyncGenerator<T> =
-  T extends AsyncGenerator<unknown, unknown, unknown>
-    ? T
-    : T extends Generator<infer U, unknown, unknown>
-      ? AsyncGenerator<U, unknown, unknown>
-      : AsyncGenerator<T, unknown, unknown>;
-type ToProperReturnType<T> = T extends Generator<unknown, unknown, unknown> | AsyncGenerator<unknown, unknown, unknown>
-  ? ToAsyncGenerator<T>
-  : ToPromise<T>;
-
-type OmitNever<T> = {
-  [K in keyof T as T[K] extends never ? never : K]: T[K];
-};
-
-export type WorkerPromiseInstanceWithNever<T> = {
-  [K in keyof T]: T[K] extends (...args: KnownAny[]) => KnownAny
-    ? (...args: Parameters<T[K]>) => ToProperReturnType<ReturnType<T[K]>>
-    : never;
-};
-
-export type WorkerPromiseInstance<T> = OmitNever<WorkerPromiseInstanceWithNever<T>> & {
-  terminate: () => void;
-  employ: (w: Worker) => WorkerPromiseInstance<T>;
-  fork: (w: Worker) => WorkerPromiseInstance<T>;
-  worker: Worker | null;
-  _isTerminated?: true;
-  [Symbol.dispose]: () => void;
-};
-
-export interface WorkerInput {
-  methodName: string;
-  args: unknown[];
-  key: number;
-}
-
-export interface WorkerOutput {
-  methodName: string;
-  result?: unknown;
-  error?: unknown;
-  done?: true;
-  key: number;
-}

package/src/worker/worker.ts

@@ -1,53 +0,0 @@
-import type { VovkWorker } from '../types';
-import type { WorkerInput, WorkerOutput } from './types';
-
-export function worker() {
-  return (t: object) => {
-    const target = t as Record<
-      string,
-      (
-        ...args: unknown[]
-      ) => Iterable<unknown> | AsyncIterable<unknown> | Promise<Iterable<unknown> | AsyncIterable<unknown>>
-    > &
-      VovkWorker;
-    target._handlers = {};
-
-    for (const key of Object.getOwnPropertyNames(target)) {
-      const member = target[key];
-      if (typeof member === 'function') {
-        const prototype = Object.getPrototypeOf(member) as unknown;
-        const isGenerator =
-          prototype === Object.getPrototypeOf(function* () {}) ||
-          prototype === Object.getPrototypeOf(async function* () {});
-        target._handlers[key] = {};
-
-        if (isGenerator) {
-          target._handlers[key].isGenerator = true;
-        }
-      }
-    }
-
-    if (typeof self === 'undefined') return; // no-op in non-worker environment
-
-    const w = self as unknown as Worker;
-
-    w.onmessage = async (evt: MessageEvent<WorkerInput>) => {
-      const { methodName, args, key } = evt.data;
-      try {
-        const result = await target[methodName](...args);
-
-        if (result && typeof result === 'object' && 'next' in result && typeof result.next === 'function') {
-          const iterable = result as Iterable<unknown> | AsyncIterable<unknown>;
-          for await (const result of iterable) {
-            w.postMessage({ result, key, methodName } satisfies WorkerOutput);
-          }
-          w.postMessage({ done: true, key, methodName } satisfies WorkerOutput);
-        } else {
-          w.postMessage({ result, key, methodName } satisfies WorkerOutput);
-        }
-      } catch (e) {
-        w.postMessage({ error: e, key, methodName } satisfies WorkerOutput);
-      }
-    };
-  };
-}