vovk 3.0.0-draft.19 → 3.0.0-draft.20

package/Segment.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._Segment = 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 {
@@ -137,9 +137,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),
                     },
                 });

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/client/defaultFetcher.js

@@ -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/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;
@@ -26,7 +26,7 @@ export type _StreamAsyncIterator<T> = {
 };
 type StaticMethodReturn<T extends _ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? unknown : 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];
 };

package/index.d.ts

@@ -1,12 +1,12 @@
 import { _createSegment as createSegment } from './createSegment';
-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 _VovkControllerReturnType as VovkControllerReturnType, type _VovkControllerYieldType as VovkControllerYieldType, type _VovkSchema as VovkSchema, _HttpStatus as HttpStatus, _HttpMethod as HttpMethod } from './types';
+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 VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerReturnType, type VovkControllerYieldType, type VovkClientOptions, StreamResponse, HttpException, HttpStatus, HttpMethod, createSegment, createDecorator, worker, 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, createSegment, 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;

package/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.generateStaticAPI = exports.worker = exports.createDecorator = exports.createSegment = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.StreamResponse = void 0;
+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.StreamJSONResponse = void 0;
 const createSegment_1 = require("./createSegment");
 Object.defineProperty(exports, "createSegment", { enumerable: true, get: function () { return createSegment_1._createSegment; } });
 const types_1 = require("./types");
@@ -11,8 +11,8 @@ 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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.19",
+  "version": "3.0.0-draft.20",
   "description": "RESTful RPC for Next.js - Transforms Next.js into a powerful REST API platform with RPC capabilities.",
   "repository": {
     "type": "git",

package/types.d.ts

@@ -1,5 +1,5 @@
 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;
@@ -76,39 +76,15 @@ export type _ControllerStaticMethod<REQ extends _VovkRequest<_KnownAny, _KnownAn
 } = _KnownAny> = ((req: REQ, params: PARAMS) => unknown) & {
     _controller?: _VovkController;
 };
-export type _VovkControllerBody<T extends _ControllerStaticMethod<_KnownAny, _KnownAny>> = Awaited<ReturnType<Parameters<T>[0]['vovk']['body']>>;
-export type _VovkControllerQuery<T extends _ControllerStaticMethod<_KnownAny, _KnownAny>> = ReturnType<Parameters<T>[0]['vovk']['query']>;
-export type _VovkControllerParams<T extends _ControllerStaticMethod<_KnownAny, _KnownAny>> = Parameters<T>[1];
-export type _VovkControllerReturnType<T extends _ControllerStaticMethod<_KnownAny, _KnownAny>> = Awaited<ReturnType<T>>;
-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<StreamResponse<infer Y>> | StreamResponse<infer Y> ? Y : never;
-export type _VovkClientBody<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    body: B;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], B = _KnownAny> = Parameters<T>[0]['body'];
-export type _VovkClientQuery<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    query: Q;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], Q = _KnownAny> = Parameters<T>[0]['query'];
-export type _VovkClientParams<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    params: P;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], P = _KnownAny> = Parameters<T>[0]['params'];
-export type _VovkClientYieldType<T extends (...args: _KnownAny[]) => unknown> = T extends (...args: _KnownAny[]) => Promise<StreamAsyncIterator<infer Y>> ? Y : never;
-export type _VovkClientReturnType<T extends (...args: _KnownAny) => unknown> = Awaited<ReturnType<T>>;
-export type _VovkBody<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    body: B;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], B = _KnownAny> = _VovkClientBody<T, OPTIONS, B>;
-export type _VovkQuery<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    query: Q;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], Q = _KnownAny> = _VovkClientQuery<T, OPTIONS, Q>;
-export type _VovkParams<T extends (options: OPTIONS) => _KnownAny, OPTIONS extends {
-    params: P;
-    [key: string]: _KnownAny;
-} = Parameters<T>[0], P = _KnownAny> = _VovkClientParams<T, OPTIONS, P>;
-export type _VovkReturnType<T extends (...args: _KnownAny) => unknown> = _VovkClientReturnType<T>;
-export type _VovkYieldType<T extends (...args: _KnownAny) => unknown> = _VovkClientYieldType<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;