vovk 3.0.0-draft.239 → 3.0.0-draft.241

package/cjs/HttpException.d.ts

@@ -1,4 +1,4 @@
-import type { HttpStatus } from './types.js';
+import type { HttpStatus } from './types';
 export declare class HttpException extends Error {
     statusCode: HttpStatus;
     message: string;

package/cjs/JSONLinesResponse.d.ts

@@ -12,16 +12,4 @@ export declare class JSONLinesResponse<T> extends Response {
     throw(e: KnownAny): void;
     [Symbol.dispose](): void;
     [Symbol.asyncDispose](): void;
-    private nextValueReject;
-    private nextValueResolve;
-    private nextValue;
-    [Symbol.asyncIterator](): {
-        next: () => Promise<{
-            done: boolean;
-            value: null;
-        } | {
-            done: boolean;
-            value: Awaited<T>;
-        }>;
-    };
 }

package/cjs/JSONLinesResponse.js

@@ -39,7 +39,6 @@ class JSONLinesResponse extends Response {
         const { controller, encoder } = this;
         if (this.isClosed)
             return;
-        this.nextValueResolve(data);
         return controller?.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
     }
     close() {
@@ -51,7 +50,6 @@ class JSONLinesResponse extends Response {
     }
     throw(e) {
         this.send({ isError: true, reason: e instanceof Error ? e.message : e });
-        this.nextValueReject(e);
         return this.close();
     }
     [Symbol.dispose]() {
@@ -60,23 +58,5 @@ class JSONLinesResponse extends Response {
     [Symbol.asyncDispose]() {
         this.close();
     }
-    nextValueReject = () => { };
-    nextValueResolve = () => { };
-    nextValue() {
-        const { resolve, reject, promise } = Promise.withResolvers();
-        this.nextValueResolve = resolve;
-        this.nextValueReject = reject;
-        return promise;
-    }
-    [Symbol.asyncIterator]() {
-        return {
-            next: async () => {
-                if (this.isClosed) {
-                    return { done: true, value: null };
-                }
-                return { done: false, value: await this.nextValue() };
-            },
-        };
-    }
 }
 exports.JSONLinesResponse = JSONLinesResponse;

package/cjs/VovkApp.d.ts

@@ -1,5 +1,5 @@
 import type { NextRequest } from 'next/server';
-import { HttpMethod, HttpStatus, type RouteHandler, type VovkController, type DecoratorOptions } from './types.js';
+import { HttpMethod, HttpStatus, type RouteHandler, type VovkController, type DecoratorOptions } from './types';
 export declare class VovkApp {
     #private;
     private static getHeadersFromOptions;

package/cjs/VovkApp.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VovkApp = void 0;
-const types_js_1 = require("./types.js");
-const HttpException_js_1 = require("./HttpException.js");
-const JSONLinesResponse_js_1 = require("./JSONLinesResponse.js");
-const reqQuery_js_1 = __importDefault(require("./utils/reqQuery.js"));
-const reqMeta_js_1 = __importDefault(require("./utils/reqMeta.js"));
-const reqForm_js_1 = __importDefault(require("./utils/reqForm.js"));
+const types_1 = require("./types");
+const HttpException_1 = require("./HttpException");
+const JSONLinesResponse_1 = require("./JSONLinesResponse");
+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) {
@@ -36,13 +36,13 @@ class VovkApp {
         HEAD: new Map(),
         OPTIONS: new Map(),
     };
-    GET = async (req, data) => this.#callMethod(types_js_1.HttpMethod.GET, req, await data.params);
-    POST = async (req, data) => this.#callMethod(types_js_1.HttpMethod.POST, req, await data.params);
-    PUT = async (req, data) => this.#callMethod(types_js_1.HttpMethod.PUT, req, await data.params);
-    PATCH = async (req, data) => this.#callMethod(types_js_1.HttpMethod.PATCH, req, await data.params);
-    DELETE = async (req, data) => this.#callMethod(types_js_1.HttpMethod.DELETE, req, await data.params);
-    HEAD = async (req, data) => this.#callMethod(types_js_1.HttpMethod.HEAD, req, await data.params);
-    OPTIONS = async (req, data) => this.#callMethod(types_js_1.HttpMethod.OPTIONS, req, await data.params);
+    GET = async (req, data) => this.#callMethod(types_1.HttpMethod.GET, req, await data.params);
+    POST = async (req, data) => this.#callMethod(types_1.HttpMethod.POST, req, await data.params);
+    PUT = async (req, data) => this.#callMethod(types_1.HttpMethod.PUT, req, await data.params);
+    PATCH = async (req, data) => this.#callMethod(types_1.HttpMethod.PATCH, req, await data.params);
+    DELETE = async (req, data) => this.#callMethod(types_1.HttpMethod.DELETE, req, await data.params);
+    HEAD = async (req, data) => this.#callMethod(types_1.HttpMethod.HEAD, req, await data.params);
+    OPTIONS = async (req, data) => this.#callMethod(types_1.HttpMethod.OPTIONS, req, await data.params);
     respond = (status, body, options) => {
         return new Response(JSON.stringify(body), {
             status,
@@ -61,7 +61,7 @@ class VovkApp {
         }, options);
     };
     #getHandler = ({ handlers, path, params, }) => {
-        const methodParams = {};
+        let methodParams = {};
         if (Object.keys(params).length === 0) {
             return { handler: handlers[''], methodParams };
         }
@@ -71,7 +71,7 @@ class VovkApp {
         methodKeys = allMethodKeys
             // First, try to match literal routes exactly.
             .filter((p) => {
-            if (p.includes(':'))
+            if (p.includes('{'))
                 return false; // Skip parameterized paths
             return p === pathStr;
         });
@@ -80,27 +80,37 @@ class VovkApp {
                 const routeSegments = p.split('/');
                 if (routeSegments.length !== path.length)
                     return false;
+                const params = {};
                 for (let i = 0; i < routeSegments.length; i++) {
                     const routeSegment = routeSegments[i];
                     const pathSegment = path[i];
-                    if (routeSegment.startsWith(':')) {
-                        const parameter = routeSegment.slice(1);
-                        if (parameter in methodParams) {
-                            throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.INTERNAL_SERVER_ERROR, `Duplicate parameter "${parameter}" at ${p}`);
+                    if (routeSegment.includes('{')) {
+                        // const parameter = routeSegment.slice(1);
+                        const regexPattern = routeSegment
+                            .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // Escape special chars
+                            .replace(/\\{(\w+)\\}/g, '(?<$1>[^/]+)'); // Replace {var} with named groups
+                        const values = pathSegment.match(new RegExp(`^${regexPattern}$`))?.groups ?? {};
+                        for (const parameter in values) {
+                            if (!Object.prototype.hasOwnProperty.call(values, parameter))
+                                continue;
+                            if (parameter in params) {
+                                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Duplicate parameter "${parameter}" at ${p}`);
+                            }
+                            // If it's a parameterized segment, capture the parameter value.
+                            params[parameter] = values[parameter];
                         }
-                        // If it's a parameterized segment, capture the parameter value.
-                        methodParams[parameter] = pathSegment;
                     }
                     else if (routeSegment !== pathSegment) {
                         // If it's a literal segment and it does not match the corresponding path segment, return false.
                         return false;
                     }
                 }
+                methodParams = params;
                 return true;
             });
         }
         if (methodKeys.length > 1) {
-            throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.INTERNAL_SERVER_ERROR, `Conflicting routes found: ${methodKeys.join(', ')}`);
+            throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Conflicting routes found: ${methodKeys.join(', ')}`);
         }
         const [methodKey] = methodKeys;
         if (methodKey) {
@@ -122,14 +132,14 @@ class VovkApp {
         });
         const { handler, methodParams } = this.#getHandler({ handlers, path, params });
         if (!handler) {
-            return this.#respondWithError(types_js_1.HttpStatus.NOT_FOUND, `${Object.keys(handlers)} - Route ${path.join('/')} is not found`);
+            return this.#respondWithError(types_1.HttpStatus.NOT_FOUND, `${Object.keys(handlers)} - Route ${path.join('/')} is not found`);
         }
         const { staticMethod, controller } = handler;
         req.vovk = {
             body: () => req.json(),
-            query: () => (0, reqQuery_js_1.default)(req),
-            meta: (meta) => (0, reqMeta_js_1.default)(req, meta),
-            form: () => (0, reqForm_js_1.default)(req),
+            query: () => (0, reqQuery_1.default)(req),
+            meta: (meta) => (0, reqMeta_1.default)(req, meta),
+            form: () => (0, reqForm_1.default)(req),
             params: () => methodParams,
         };
         try {
@@ -142,7 +152,7 @@ class VovkApp {
                     (Reflect.has(result, Symbol.asyncIterator) &&
                         typeof result[Symbol.asyncIterator] === 'function'));
             if (isIterator && !(result instanceof Array)) {
-                const streamResponse = new JSONLinesResponse_js_1.JSONLinesResponse(await (0, headers_1.headers)(), {
+                const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(await (0, headers_1.headers)(), {
                     headers: {
                         ..._a.getHeadersFromOptions(staticMethod._options),
                     },
@@ -175,7 +185,7 @@ class VovkApp {
                 console.error(onErrorError);
             }
             if (err.message !== 'NEXT_REDIRECT' && err.message !== 'NEXT_NOT_FOUND') {
-                const statusCode = err.statusCode || types_js_1.HttpStatus.INTERNAL_SERVER_ERROR;
+                const statusCode = err.statusCode || types_1.HttpStatus.INTERNAL_SERVER_ERROR;
                 return this.#respondWithError(statusCode, err.message, staticMethod._options, err.cause);
             }
             throw e; // if NEXT_REDIRECT or NEXT_NOT_FOUND, rethrow it

package/cjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
-import type { KnownAny, VovkSchema } from '../types.js';
-import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types.js';
+import type { KnownAny, VovkSchema } from '../types';
+import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types';
 export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, fetcher?: VovkClientFetcher<OPTS>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -4,37 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPC = void 0;
-const fetcher_js_1 = require("./fetcher.js");
-const defaultHandler_js_1 = require("./defaultHandler.js");
-const defaultStreamHandler_js_1 = require("./defaultStreamHandler.js");
-const serializeQuery_js_1 = __importDefault(require("../utils/serializeQuery.js"));
+const fetcher_1 = require("./fetcher");
+const defaultHandler_1 = require("./defaultHandler");
+const defaultStreamHandler_1 = require("./defaultStreamHandler");
+const serializeQuery_1 = __importDefault(require("../utils/serializeQuery"));
 const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
 const getHandlerPath = (endpoint, params, query) => {
     let result = endpoint;
-    const queryStr = query ? (0, serializeQuery_js_1.default)(query) : null;
+    const queryStr = query ? (0, serializeQuery_1.default)(query) : null;
     for (const [key, value] of Object.entries(params ?? {})) {
-        result = result.replace(`:${key}`, value);
+        result = result.replace(`{${key}}`, value);
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, segmentName, rpcModuleName, fetcher = fetcher_js_1.fetcher, options) => {
+const createRPC = (schema, segmentName, rpcModuleName, fetcher = fetcher_1.fetcher, options) => {
     const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
-        throw new Error(`Unable to create RPC module. Segment schema is missing. Check client template.`);
+        throw new Error(`Unable to create RPC module. Segment schema is missing for segment "${segmentName}".`);
     const controllerSchema = schema.segments[segmentName]?.controllers[rpcModuleName];
     const client = {};
-    if (!controllerSchema)
-        throw new Error(`Unable to create RPC module. Controller schema is missing. Check client template.`);
+    if (!controllerSchema) {
+        console.log('schema.segments[segmentName]', schema.segments[segmentName]);
+        throw new Error(`Unable to create RPC module. Controller schema is missing for module "${rpcModuleName}" from segment "${segmentName}".`);
+    }
     const controllerPrefix = trimPath(controllerSchema.prefix ?? '');
     for (const [staticMethodName, handlerSchema] of Object.entries(controllerSchema.handlers ?? {})) {
         const { path, httpMethod, validation } = handlerSchema;
         const getEndpoint = ({ apiRoot, params, query, }) => {
-            apiRoot = apiRoot ?? controllerSchema.forceApiRoot ?? options?.apiRoot ?? '/api';
+            const forceApiRoot = controllerSchema.forceApiRoot ?? segmentSchema.forceApiRoot;
+            apiRoot = apiRoot ?? forceApiRoot ?? options?.apiRoot ?? '/api';
             const endpoint = [
                 apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
                 apiRoot,
-                controllerSchema.forceApiRoot ? '' : segmentNamePath,
+                forceApiRoot ? '' : segmentNamePath,
                 getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query),
             ]
                 .filter(Boolean)
@@ -57,8 +60,8 @@ const createRPC = (schema, segmentName, rpcModuleName, fetcher = fetcher_js_1.fe
                 httpMethod: httpMethod,
                 getEndpoint,
                 validate,
-                defaultHandler: defaultHandler_js_1.defaultHandler,
-                defaultStreamHandler: defaultStreamHandler_js_1.defaultStreamHandler,
+                defaultHandler: defaultHandler_1.defaultHandler,
+                defaultStreamHandler: defaultStreamHandler_1.defaultStreamHandler,
             };
             const internalInput = {
                 ...options,

package/cjs/client/defaultHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultHandler = exports.DEFAULT_ERROR_MESSAGE = void 0;
-const HttpException_js_1 = require("../HttpException.js");
+const HttpException_1 = require("../HttpException");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultHandler';
 const defaultHandler = async (response) => {
     let result;
@@ -10,12 +10,12 @@ const defaultHandler = async (response) => {
     }
     catch (e) {
         // handle parsing errors
-        throw new HttpException_js_1.HttpException(response.status, e?.message ?? exports.DEFAULT_ERROR_MESSAGE);
+        throw new HttpException_1.HttpException(response.status, e?.message ?? exports.DEFAULT_ERROR_MESSAGE);
     }
     if (!response.ok) {
         // handle server errors
         const errorResponse = result;
-        throw new HttpException_js_1.HttpException(response.status, errorResponse?.message ?? exports.DEFAULT_ERROR_MESSAGE, errorResponse?.cause);
+        throw new HttpException_1.HttpException(response.status, errorResponse?.message ?? exports.DEFAULT_ERROR_MESSAGE, errorResponse?.cause);
     }
     return result;
 };

package/cjs/client/defaultStreamHandler.d.ts

@@ -1,4 +1,4 @@
-import type { VovkStreamAsyncIterable } from './types.js';
-import '../utils/shim.js';
+import type { VovkStreamAsyncIterable } from './types';
+import '../utils/shim';
 export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at defaultStreamHandler";
 export declare const defaultStreamHandler: (response: Response) => Promise<VovkStreamAsyncIterable<unknown>>;

package/cjs/client/defaultStreamHandler.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultStreamHandler = exports.DEFAULT_ERROR_MESSAGE = void 0;
-const types_js_1 = require("../types.js");
-const HttpException_js_1 = require("../HttpException.js");
-require("../utils/shim.js");
+const types_1 = require("../types");
+const HttpException_1 = require("../HttpException");
+require("../utils/shim");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultStreamHandler';
 const defaultStreamHandler = async (response) => {
     if (!response.ok) {
@@ -15,10 +15,10 @@ const defaultStreamHandler = async (response) => {
             // ignore parsing errors
         }
         // handle server errors
-        throw new HttpException_js_1.HttpException(response.status, result.message ?? exports.DEFAULT_ERROR_MESSAGE);
+        throw new HttpException_1.HttpException(response.status, result.message ?? exports.DEFAULT_ERROR_MESSAGE);
     }
     if (!response.body)
-        throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.NULL, 'Stream body is falsy. Check your controller code.');
+        throw new HttpException_1.HttpException(types_1.HttpStatus.NULL, 'Stream body is falsy. Check your controller code.');
     const reader = response.body.getReader();
     // if streaming is too rapid, we need to make sure that the loop is stopped
     let canceled = false;

package/cjs/client/fetcher.d.ts

@@ -1,4 +1,4 @@
-import type { VovkDefaultFetcherOptions, VovkClientFetcher } from './types.js';
+import type { VovkDefaultFetcherOptions, VovkClientFetcher } from './types';
 export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
 export declare function createFetcher<T>({ prepareRequestInit, transformResponse, }?: {
     prepareRequestInit?: (init: RequestInit, options: VovkDefaultFetcherOptions<T>) => RequestInit | Promise<RequestInit> | void | Promise<void>;
@@ -7,7 +7,7 @@ export declare function createFetcher<T>({ prepareRequestInit, transformResponse
 export declare const fetcher: VovkClientFetcher<{
     apiRoot?: string;
     disableClientValidation?: boolean;
-    validateOnClient?: import("./types.js").VovkValidateOnClient;
+    validateOnClient?: import("./types").VovkValidateOnClient;
     interpretAs?: string;
     init?: RequestInit;
 }>;

package/cjs/client/fetcher.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetcher = exports.DEFAULT_ERROR_MESSAGE = void 0;
 exports.createFetcher = createFetcher;
-const types_js_1 = require("../types.js");
-const HttpException_js_1 = require("../HttpException.js");
+const types_1 = require("../types");
+const HttpException_1 = require("../HttpException");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at default fetcher';
 function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
     // fetcher uses HttpException class to throw errors of fake HTTP status 0 if client-side error occurs
@@ -11,11 +11,9 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
     const newFetcher = async ({ httpMethod, getEndpoint, validate, defaultHandler, defaultStreamHandler }, options) => {
         const { params, query, body, apiRoot, disableClientValidation, init, interpretAs } = options;
         const endpoint = getEndpoint({ apiRoot, params, query });
-        const unusedParams = new URL(endpoint.startsWith('/') ? `http://localhost${endpoint}` : endpoint).pathname
-            .split('/')
-            .filter((segment) => segment.startsWith(':'));
+        const unusedParams = Array.from(new URL(endpoint.startsWith('/') ? `http://localhost${endpoint}` : endpoint).pathname.matchAll(/\{([^}]+)\}/g)).map((m) => m[1]);
         if (unusedParams.length) {
-            throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.NULL, `Unused params: ${unusedParams.join(', ')} in ${endpoint}`, {
+            throw new HttpException_1.HttpException(types_1.HttpStatus.NULL, `Unused params: ${unusedParams.join(', ')} in ${endpoint}`, {
                 body,
                 query,
                 params,
@@ -28,10 +26,10 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
             }
             catch (e) {
                 // if HttpException is thrown, rethrow it
-                if (e instanceof HttpException_js_1.HttpException)
+                if (e instanceof HttpException_1.HttpException)
                     throw e;
                 // otherwise, throw HttpException with status 0
-                throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.NULL, e.message ?? exports.DEFAULT_ERROR_MESSAGE, {
+                throw new HttpException_1.HttpException(types_1.HttpStatus.NULL, e.message ?? exports.DEFAULT_ERROR_MESSAGE, {
                     body,
                     query,
                     params,
@@ -62,7 +60,7 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
         }
         catch (e) {
             // handle network errors
-            throw new HttpException_js_1.HttpException(types_js_1.HttpStatus.NULL, (e?.message ?? exports.DEFAULT_ERROR_MESSAGE) + ' ' + endpoint, {
+            throw new HttpException_1.HttpException(types_1.HttpStatus.NULL, (e?.message ?? exports.DEFAULT_ERROR_MESSAGE) + ' ' + endpoint, {
                 body,
                 query,
                 params,

package/cjs/client/index.d.ts

@@ -1,3 +1,4 @@
-export { createRPC } from './createRPC.js';
-export { fetcher, createFetcher } from './fetcher.js';
-export type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions, VovkValidateOnClient, VovkStreamAsyncIterable, } from './types.js';
+export { createRPC } from './createRPC';
+export { fetcher, createFetcher } from './fetcher';
+export { progressive } from './progressive';
+export type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions, VovkValidateOnClient, VovkStreamAsyncIterable, } from './types';

package/cjs/client/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFetcher = exports.fetcher = exports.createRPC = void 0;
-var createRPC_js_1 = require("./createRPC.js");
-Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return createRPC_js_1.createRPC; } });
-var fetcher_js_1 = require("./fetcher.js");
-Object.defineProperty(exports, "fetcher", { enumerable: true, get: function () { return fetcher_js_1.fetcher; } });
-Object.defineProperty(exports, "createFetcher", { enumerable: true, get: function () { return fetcher_js_1.createFetcher; } });
+exports.progressive = exports.createFetcher = exports.fetcher = exports.createRPC = void 0;
+var createRPC_1 = require("./createRPC");
+Object.defineProperty(exports, "createRPC", { enumerable: true, get: function () { return createRPC_1.createRPC; } });
+var fetcher_1 = require("./fetcher");
+Object.defineProperty(exports, "fetcher", { enumerable: true, get: function () { return fetcher_1.fetcher; } });
+Object.defineProperty(exports, "createFetcher", { enumerable: true, get: function () { return fetcher_1.createFetcher; } });
+var progressive_1 = require("./progressive");
+Object.defineProperty(exports, "progressive", { enumerable: true, get: function () { return progressive_1.progressive; } });

package/cjs/{utils → client}/progressive.d.ts

@@ -1,4 +1,4 @@
-import type { VovkStreamAsyncIterable } from '../client/types';
+import type { VovkStreamAsyncIterable } from './types';
 import type { KnownAny, VovkIteration } from '../types';
 type UnionToIntersection<U> = (U extends KnownAny ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 type PromisifyProperties<T> = {

package/cjs/{utils → client}/progressive.js

@@ -8,8 +8,8 @@ function progressive(fn, ...args) {
         .then(async (result) => {
         for await (const item of result) {
             for (const [key, value] of Object.entries(item)) {
-                if (key in reg && !reg[key].isFulfilled) {
-                    reg[key].isFulfilled = true;
+                if (key in reg && !reg[key].isSettled) {
+                    reg[key].isSettled = true;
                     reg[key].resolve(value);
                 }
             }
@@ -18,9 +18,9 @@ function progressive(fn, ...args) {
     })
         .catch((error) => {
         Object.keys(reg).forEach((key) => {
-            if (reg[key].isFulfilled)
+            if (reg[key].isSettled)
                 return;
-            reg[key].isFulfilled = true;
+            reg[key].isSettled = true;
             reg[key].reject(error);
         });
         return error;
@@ -31,20 +31,8 @@ function progressive(fn, ...args) {
                 return reg[prop].promise;
             }
             const { promise, resolve, reject } = Promise.withResolvers();
-            reg[prop] = { resolve, reject, promise, isFulfilled: false };
+            reg[prop] = { resolve, reject, promise, isSettled: false };
             return promise;
         },
     });
 }
-/*
-type OriginalType = {
-    users: string[];
-} | {
-    tasks: string[];
-} | {
-    config: string;
-} | {
-    metadata: string;
-};
-
-type Result = UnionToIntersection<OriginalType>; */

package/cjs/client/types.d.ts

@@ -1,5 +1,5 @@
-import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkHandlerSchema, VovkControllerSchema, VovkSegmentSchema, VovkSchema, VovkRequest } from '../types.js';
-import type { JSONLinesResponse } from '../JSONLinesResponse.js';
+import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkHandlerSchema, VovkControllerSchema, VovkSegmentSchema, VovkSchema, VovkRequest } from '../types';
+import type { JSONLinesResponse } from '../JSONLinesResponse';
 import type { NextResponse } from 'next/server';
 type OmitNullable<T> = {
     [K in keyof T as T[K] extends null | undefined ? never : K]: T[K];

package/cjs/createVovkApp.d.ts

@@ -1,5 +1,5 @@
 import type { NextRequest } from 'next/server';
-import { type KnownAny, type DecoratorOptions, type VovkRequest, type StaticClass } from './types.js';
+import { type KnownAny, type DecoratorOptions, type VovkRequest, type StaticClass } from './types';
 export declare function createVovkApp(): {
     get: {
         (givenPath?: string | undefined, options?: DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
@@ -30,7 +30,7 @@ export declare function createVovkApp(): {
         auto: (options?: DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;
     };
     prefix: (givenPath?: string) => (givenTarget: KnownAny) => any;
-    initVovk: (options: {
+    initSegment: (options: {
         segmentName?: string;
         controllers: Record<string, StaticClass>;
         exposeValidation?: boolean;

package/cjs/createVovkApp.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createVovkApp = createVovkApp;
-const VovkApp_js_1 = require("./VovkApp.js");
-const types_js_1 = require("./types.js");
-const getSchema_js_1 = __importDefault(require("./utils/getSchema.js"));
+const VovkApp_1 = require("./VovkApp");
+const types_1 = require("./types");
+const getSchema_1 = __importDefault(require("./utils/getSchema"));
 const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
 const isClass = (func) => typeof func === 'function' && /class/.test(func.toString());
 const toKebabCase = (str) => str
@@ -52,7 +52,7 @@ const assignSchema = ({ controller, propertyKey, path, options, httpMethod, vovk
     };
 };
 function createVovkApp() {
-    const vovkApp = new VovkApp_js_1.VovkApp();
+    const vovkApp = new VovkApp_1.VovkApp();
     const createHTTPDecorator = (httpMethod) => {
         function decoratorCreator(givenPath = '', options) {
             const path = trimPath(givenPath);
@@ -93,7 +93,7 @@ function createVovkApp() {
             return givenTarget;
         };
     };
-    const initVovk = (options) => {
+    const initSegment = (options) => {
         options.segmentName = trimPath(options.segmentName ?? '');
         for (const [rpcModuleName, controller] of Object.entries(options.controllers ?? {})) {
             controller._rpcModuleName = rpcModuleName;
@@ -102,7 +102,7 @@ function createVovkApp() {
         async function GET_DEV(req, data) {
             const params = await data.params;
             if (params[Object.keys(params)[0]]?.[0] === '_schema_') {
-                const schema = await (0, getSchema_js_1.default)(options);
+                const schema = await (0, getSchema_1.default)(options);
                 return vovkApp.respond(200, { schema });
             }
             return vovkApp.GET(req, data);
@@ -118,14 +118,14 @@ function createVovkApp() {
         };
     };
     return {
-        get: createHTTPDecorator(types_js_1.HttpMethod.GET),
-        post: createHTTPDecorator(types_js_1.HttpMethod.POST),
-        put: createHTTPDecorator(types_js_1.HttpMethod.PUT),
-        patch: createHTTPDecorator(types_js_1.HttpMethod.PATCH),
-        del: createHTTPDecorator(types_js_1.HttpMethod.DELETE),
-        head: createHTTPDecorator(types_js_1.HttpMethod.HEAD),
-        options: createHTTPDecorator(types_js_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,
+        initSegment,
     };
 }

package/cjs/index.d.ts

@@ -1,6 +1,6 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod } from './types';
-import { type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher } from './client/index';
+import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkMetaSchema, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod } from './types';
+import { type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher, progressive } from './client/index';
 import { openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi/index';
 import { HttpException } from './HttpException';
 import { createDecorator } from './utils/createDecorator';
@@ -11,8 +11,7 @@ import { withStandard } from './utils/withStandard';
 import { multitenant } from './utils/multitenant';
 import { createLLMTools } from './utils/createLLMTools';
 import { createCodeExamples } from './utils/createCodeExamples';
-import { progressive } from './utils/progressive';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, withStandard, multitenant, createLLMTools, createCodeExamples, progressive, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkMetaSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, withStandard, multitenant, createLLMTools, createCodeExamples, progressive, openapi, openAPIToVovkSchema, vovkSchemaToOpenAPI, };
 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;
@@ -34,7 +33,7 @@ export declare const get: {
 }, 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: {
+}, prefix: (givenPath?: string) => (givenTarget: KnownAny) => any, initSegment: (options: {
     segmentName?: string;
     controllers: Record<string, import("./types").StaticClass>;
     exposeValidation?: boolean;