vovk 3.0.0-draft.96 → 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/types.d.ts

@@ -114,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;
@@ -140,15 +142,15 @@ 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>;

package/package.json

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