vovk 3.0.0-draft.95 → 3.0.0-draft.97

package/dist/StreamJSONResponse.d.ts

@@ -1,14 +1,12 @@
+import type { headers } from 'next/headers';
 import type { KnownAny, StreamAbortMessage } from './types';
 import './utils/shim';
 export declare class StreamJSONResponse<T> extends Response {
-    static defaultHeaders: {
-        'content-type': string;
-    };
     isClosed: boolean;
     controller?: ReadableStreamDefaultController;
     readonly encoder: TextEncoder;
     readonly readableStream: ReadableStream;
-    constructor(init?: ResponseInit);
+    constructor(requestHeaders: Awaited<ReturnType<typeof headers>>, init?: ResponseInit);
     send(data: T | StreamAbortMessage): void;
     close(): void;
     throw(e: KnownAny): void;

package/dist/StreamJSONResponse.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StreamJSONResponse = void 0;
 require("./utils/shim");
 class StreamJSONResponse extends Response {
-    static defaultHeaders = {
-        'content-type': 'text/plain; x-format=jsonlines',
-    };
     isClosed = false;
     controller;
     encoder;
     readableStream;
-    constructor(init) {
+    constructor(requestHeaders, init) {
         const encoder = new TextEncoder();
         let readableController;
         const readableStream = new ReadableStream({
@@ -21,9 +18,16 @@ class StreamJSONResponse extends Response {
                 readableController = controller;
             },
         });
+        if (!requestHeaders) {
+            throw new Error('Request headers are required');
+        }
+        const accept = requestHeaders.get('accept');
         super(readableStream, {
             ...init,
-            headers: init?.headers ?? StreamJSONResponse.defaultHeaders,
+            headers: {
+                ...init?.headers,
+                'Content-Type': accept?.includes('application/jsonl') ? 'application/jsonl' : 'plain/text',
+            },
         });
         this.readableStream = readableStream;
         this.encoder = encoder;

package/dist/VovkApp.js

@@ -11,6 +11,7 @@ const StreamJSONResponse_1 = require("./StreamJSONResponse");
 const reqQuery_1 = __importDefault(require("./utils/reqQuery"));
 const reqMeta_1 = __importDefault(require("./utils/reqMeta"));
 const reqForm_1 = __importDefault(require("./utils/reqForm"));
+const headers_1 = require("next/headers");
 class VovkApp {
     static getHeadersFromOptions(options) {
         if (!options)
@@ -143,9 +144,8 @@ class VovkApp {
                     (Reflect.has(result, Symbol.asyncIterator) &&
                         typeof result[Symbol.asyncIterator] === 'function'));
             if (isIterator && !(result instanceof Array)) {
-                const streamResponse = new StreamJSONResponse_1.StreamJSONResponse({
+                const streamResponse = new StreamJSONResponse_1.StreamJSONResponse(await (0, headers_1.headers)(), {
                     headers: {
-                        ...StreamJSONResponse_1.StreamJSONResponse.defaultHeaders,
                         ..._a.getHeadersFromOptions(staticMethod._options),
                     },
                 });

package/dist/client/fetcher.js

@@ -28,6 +28,10 @@ const fetcher = async ({ httpMethod, getEndpoint, validate, defaultHandler, defa
     const init = {
         method: httpMethod,
         ...options,
+        headers: {
+            ...options.headers,
+            accept: 'application/jsonl, application/json',
+        },
     };
     if (body instanceof FormData) {
         init.body = body;

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus as HttpStatus, HttpMethod as HttpMethod, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv } from './types';
+import { HttpStatus as HttpStatus, HttpMethod as HttpMethod, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv, type VovkValidationType } from './types';
 import { type VovkClient, type VovkClientOptions, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher } from './client';
 import { HttpException } from './HttpException';
 import { createDecorator } from './createDecorator';
 import { StreamJSONResponse } from './StreamJSONResponse';
 import { generateStaticAPI } from './utils/generateStaticAPI';
 import { withValidation } from './utils/withValidation';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, generateStaticAPI, withValidation, };
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkControllerBody, type VovkControllerQuery, type VovkControllerParams, type VovkControllerYieldType, type VovkControllerOutput, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkFullSchema, type VovkConfig, type VovkStrictConfig, type VovkEnv, type VovkValidationType, StreamJSONResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, generateStaticAPI, withValidation, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/dist/types.d.ts

@@ -10,8 +10,9 @@ export type VovkHandlerSchema = {
     validation?: {
         query?: KnownAny;
         body?: KnownAny;
-        output?: KnownAny;
         params?: KnownAny;
+        output?: KnownAny;
+        iteration?: KnownAny;
     };
     openapi?: OperationObject;
     custom?: Record<string, KnownAny>;
@@ -82,6 +83,9 @@ export type VovkControllerYieldType<T extends (req: VovkRequest<KnownAny, KnownA
 export type VovkControllerOutput<T extends ((...args: KnownAny) => KnownAny) & {
     __output?: KnownAny;
 }> = T['__output'];
+export type VovkControllerIteration<T extends ((...args: KnownAny) => KnownAny) & {
+    __iteration?: KnownAny;
+}> = T['__iteration'];
 export type VovkBody<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['body'];
 export type VovkQuery<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['query'];
 export type VovkParams<T extends (...args: KnownAny[]) => unknown> = Parameters<T>[0]['params'];
@@ -110,12 +114,14 @@ export type VovkEnv = {
     __VOVK_START_WATCHER_IN_STANDALONE_MODE__?: 'true';
     __VOVK_EXIT__?: 'true' | 'false';
 };
-type GenerateFrom = (string | {
+export type GenerateFromTemplate = {
     templatePath: string;
     outDir?: string;
     templateName?: string;
     fullSchema?: string | boolean;
-})[];
+    origin?: string | null;
+};
+type GenerateFrom = (string | GenerateFromTemplate)[];
 export type VovkConfig = {
     emitConfig?: boolean | (keyof VovkStrictConfig)[];
     clientOutDir?: string;
@@ -136,20 +142,21 @@ export type VovkConfig = {
         controller?: string;
         [key: string]: string | undefined;
     };
-    custom?: Record<string, KnownAny>;
+    libs?: Record<string, KnownAny>;
 };
-export type VovkStrictConfig = Required<Omit<VovkConfig, 'emitConfig' | 'validateOnClientImport' | 'fetcherImport' | 'createRPCImport' | 'generateFrom' | 'custom'>> & {
+export type VovkStrictConfig = Required<Omit<VovkConfig, 'emitConfig' | 'validateOnClientImport' | 'fetcherImport' | 'createRPCImport' | 'generateFrom' | 'libs'>> & {
     emitConfig: (keyof VovkStrictConfig)[];
     validateOnClientImport: string[] | null;
     fetcherImport: string[];
     createRPCImport: string[];
     generateFrom: GenerateFrom;
-    custom: Record<string, KnownAny>;
+    libs: Record<string, KnownAny>;
 };
 export type VovkFullSchema = {
     config: Partial<VovkStrictConfig>;
     segments: Record<string, VovkSegmentSchema>;
 };
+export type VovkValidationType = 'body' | 'query' | 'params' | 'output' | 'iteration';
 export declare enum HttpMethod {
     GET = "GET",
     POST = "POST",

package/dist/utils/withValidation.d.ts

@@ -1,13 +1,20 @@
-import { VovkHandlerSchema, type KnownAny, type VovkRequest } from '../types';
-export declare function withValidation<T extends (req: KnownAny, params: KnownAny) => KnownAny, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL>({ body, query, params, output, handle, getHandlerSchema, validate, }: {
+import { VovkHandlerSchema, VovkValidationType, type KnownAny, type VovkRequest } from '../types';
+export declare function withValidation<T extends (req: KnownAny, params: KnownAny) => KnownAny, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL>({ skipServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getHandlerSchema, validate, }: {
+    skipServerSideValidation?: boolean | VovkValidationType[];
+    skipSchemaEmission?: boolean | VovkValidationType[];
+    validateEveryIteration?: boolean;
     body?: BODY_MODEL;
     query?: QUERY_MODEL;
     params?: PARAMS_MODEL;
     output?: OUTPUT_MODEL;
+    iteration?: ITERATION_MODEL;
     handle: T;
-    getHandlerSchema?: () => Omit<VovkHandlerSchema, 'httpMethod' | 'path'>;
-    validate: (data: KnownAny, model: NonNullable<BODY_MODEL | QUERY_MODEL | PARAMS_MODEL | OUTPUT_MODEL>, meta: {
-        type: 'body' | 'query' | 'params' | 'output';
+    getHandlerSchema?: (options: {
+        skipSchemaEmissionKeys: VovkValidationType[];
+    }) => Omit<VovkHandlerSchema, 'httpMethod' | 'path'>;
+    validate: (data: KnownAny, model: NonNullable<BODY_MODEL | QUERY_MODEL | PARAMS_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
+        type: VovkValidationType;
         req: VovkRequest<KnownAny, KnownAny>;
+        status?: number;
     }) => KnownAny;
 }): T;

package/dist/utils/withValidation.js

@@ -4,31 +4,61 @@ exports.withValidation = withValidation;
 const HttpException_1 = require("../HttpException");
 const types_1 = require("../types");
 const setHandlerSchema_1 = require("./setHandlerSchema");
-function withValidation({ body, query, params, output, handle, getHandlerSchema, validate, }) {
+const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
+function withValidation({ skipServerSideValidation, skipSchemaEmission, validateEveryIteration, body, query, params, output, iteration, handle, getHandlerSchema, validate, }) {
+    const skipServerSideValidationKeys = skipServerSideValidation === false
+        ? []
+        : skipServerSideValidation === true
+            ? validationTypes
+            : (skipServerSideValidation ?? []);
+    const skipSchemaEmissionKeys = skipSchemaEmission === false ? [] : skipSchemaEmission === true ? validationTypes : (skipSchemaEmission ?? []);
     const outputHandler = async (req, handlerParams) => {
         const data = await handle(req, handlerParams);
-        if (output) {
+        if (output && iteration) {
+            throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, "Output and iteration are mutually exclusive. You can't use them together.");
+        }
+        if (output && !skipServerSideValidationKeys.includes('output')) {
             if (!data) {
                 throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
             }
             await validate(data, output, { type: 'output', req });
         }
+        if (iteration && !skipServerSideValidationKeys.includes('iteration')) {
+            // We assume `data` is an async iterable here; you might want to check that:
+            if (!data || typeof data[Symbol.asyncIterator] !== 'function') {
+                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Data is not an async iterable but iteration validation is defined.');
+            }
+            // Return a brand-new async generator that yields validated items
+            return (async function* () {
+                let i = 0;
+                for await (const item of data) {
+                    if (validateEveryIteration || i === 0) {
+                        await validate(item, iteration, { type: 'iteration', req, status: 200 });
+                    }
+                    i++;
+                    yield item;
+                }
+            })();
+        }
+        else if (validateEveryIteration) {
+            throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'validateEveryIteration is set but iteration is not defined.');
+        }
         return data;
     };
     const resultHandler = async (req, handlerParams) => {
-        if (body) {
+        if (body && !skipServerSideValidationKeys.includes('body')) {
             const data = await req.json();
             const instance = (await validate(data, body, { type: 'body', req })) ?? data;
             // redeclare to add ability to call req.json() again
             req.json = () => Promise.resolve(data);
             req.vovk.body = () => Promise.resolve(instance);
         }
-        if (query) {
+        if (query && !skipServerSideValidationKeys.includes('query')) {
             const data = req.vovk.query();
             const instance = (await validate(data, query, { type: 'query', req })) ?? data;
             req.vovk.query = () => instance;
         }
-        if (params) {
+        if (params && !skipServerSideValidationKeys.includes('params')) {
             const data = req.vovk.params();
             const instance = (await validate(data, params, { type: 'params', req })) ?? data;
             req.vovk.params = () => instance;
@@ -36,7 +66,7 @@ function withValidation({ body, query, params, output, handle, getHandlerSchema,
         return outputHandler(req, handlerParams);
     };
     if (getHandlerSchema) {
-        (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, getHandlerSchema());
+        (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, getHandlerSchema({ skipSchemaEmissionKeys }));
     }
     return resultHandler;
 }

package/package.json

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