npm - vovk - Versions diffs - 3.0.0-draft.52 → 3.0.0-draft.53 - Mend

vovk 3.0.0-draft.52 → 3.0.0-draft.53

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/.turbo/turbo-build.log +1 -1
package/.turbo/turbo-tsc.log +1 -1
package/README.md +24 -1
package/dist/client/createRPC.d.ts +0 -1
package/dist/client/createRPC.js +4 -24
package/dist/types.d.ts +1 -1
package/dist/utils/parseQuery.d.ts +25 -0
package/dist/utils/parseQuery.js +156 -0
package/dist/utils/reqQuery.js +5 -20
package/dist/utils/serializeQuery.d.ts +13 -0
package/dist/utils/serializeQuery.js +65 -0
package/dist/worker/createWPC.d.ts +1 -1
package/dist/worker/createWPC.js +2 -2
package/package.json +1 -1
package/src/client/createRPC.ts +3 -23
package/src/types.ts +1 -1
package/src/utils/parseQuery.ts +160 -0
package/src/utils/reqQuery.ts +2 -22
package/src/utils/serializeQuery.ts +69 -0
package/src/worker/createWPC.ts +2 -5

package/.turbo/turbo-build.log CHANGED Viewed

@@ -1,6 +1,6 @@
-> vovk@3.0.0-draft.52 build
+> vovk@3.0.0-draft.53 build
 > tsc
 [1G[0K[1G[0K\[1G[0K

package/.turbo/turbo-tsc.log CHANGED Viewed

@@ -1,6 +1,6 @@
-> vovk@3.0.0-draft.49 tsc
+> vovk@3.0.0-draft.52 tsc
 > tsc --noEmit
 [1G[0K[1G[0K\[1G[0K

package/README.md CHANGED Viewed

@@ -1 +1,24 @@
-Description is coming soon.
+<p align="center">
+  <picture>
+    <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
+    <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
+    <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
+  </picture><br>
+  <strong>REST + RPC = ♥️</strong>
+</p>
+<p align="center">
+  Back-end meta-framework for <a href="https://nextjs.org/docs/app">Next.js</a>
+</p>
+---
+## vovk [![npm version](https://badge.fury.io/js/vovk.svg)](https://www.npmjs.com/package/vovk)
+The main library with [zero dependencies](https://bundlephobia.com/result?p=vovk) that's going to be used in production. It provides a wrapper for Next.js API routes, internal RPC API, utilities and types.
+```sh
+npm install vovk
+```
+For more information, please visit the [getting started guide](https://vovk.dev/getting-started) or check out the [Vovk.ts examples](https://vovk-examples.vercel.app/).

package/dist/client/createRPC.d.ts CHANGED Viewed

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

package/dist/client/createRPC.js CHANGED Viewed

@@ -3,39 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRPC = exports.ARRAY_QUERY_KEY = void 0;
+exports.createRPC = void 0;
 const defaultFetcher_1 = __importDefault(require("./defaultFetcher"));
 const defaultHandler_1 = require("./defaultHandler");
 const defaultStreamHandler_1 = require("./defaultStreamHandler");
-// TODO Ugly workaround. Need your ideas how to distinguish between array and non-array query params
-exports.ARRAY_QUERY_KEY = '_vovkarr';
+const serializeQuery_1 = __importDefault(require("../utils/serializeQuery"));
 const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
 const getHandlerPath = (endpoint, params, query) => {
     let result = endpoint;
     for (const [key, value] of Object.entries(params ?? {})) {
         result = result.replace(`:${key}`, value);
     }
-    const searchParams = new URLSearchParams();
-    let hasQuery = false;
-    const arrayKeys = [];
-    for (const [key, value] of Object.entries(query ?? {})) {
-        if (typeof value === 'undefined')
-            continue;
-        if (value instanceof Array) {
-            arrayKeys.push(key);
-            for (const val of value) {
-                searchParams.append(key, val);
-            }
-        }
-        else {
-            searchParams.set(key, value);
-        }
-        hasQuery = true;
-    }
-    if (arrayKeys.length) {
-        searchParams.set(exports.ARRAY_QUERY_KEY, arrayKeys.join(','));
-    }
-    return `${result}${hasQuery ? '?' : ''}${searchParams.toString()}`;
+    const queryStr = query ? (0, serializeQuery_1.default)(query) : null;
+    return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
 const createRPC = (controllerSchema, segmentName, options) => {
     const schema = controllerSchema;

package/dist/types.d.ts CHANGED Viewed

@@ -77,7 +77,7 @@ export interface VovkRequest<BODY = undefined, QUERY extends object | undefined
         form: <T = KnownAny>() => Promise<T>;
     };
 }
-export type ControllerStaticMethod<REQ extends VovkRequest<KnownAny, KnownAny> = VovkRequest<undefined, Record<string, string | string[]>>, PARAMS extends {
+export type ControllerStaticMethod<REQ extends VovkRequest<KnownAny, KnownAny> = VovkRequest<undefined, Record<string, KnownAny>>, PARAMS extends {
     [key: string]: string;
 } = KnownAny> = ((req: REQ, params: PARAMS) => unknown) & {
     _controller?: VovkController;

package/dist/utils/parseQuery.d.ts ADDED Viewed

@@ -0,0 +1,25 @@
+import type { KnownAny } from '../types';
+/**
+ * Deserialize a bracket-based query string into an object.
+ *
+ * Supports:
+ *   - Key/value pairs with nested brackets (e.g. "a[b][0]=value")
+ *   - Arrays with empty bracket (e.g. "arr[]=1&arr[]=2")
+ *   - Mixed arrays of objects, etc.
+ *
+ * @example
+ *   parseQuery("x=xx&y[0]=yy&y[1]=uu&z[f]=x&z[u][0]=uu&z[u][1]=xx&z[d][x]=ee")
+ *   => {
+ *        x: "xx",
+ *        y: ["yy", "uu"],
+ *        z: {
+ *          f: "x",
+ *          u: ["uu", "xx"],
+ *          d: { x: "ee" }
+ *        }
+ *      }
+ *
+ * @param queryString - The raw query string (e.g. location.search.slice(1))
+ * @returns           - A nested object representing the query params
+ */
+export default function parseQuery(queryString: string): Record<string, KnownAny>;

package/dist/utils/parseQuery.js ADDED Viewed

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = parseQuery;
+/**
+ * Parse a bracket-based key (e.g. "z[d][0][x]" or "arr[]")
+ * into an array of path segments (strings or special push-markers).
+ *
+ * Example: "z[d][0][x]" => ["z", "d", "0", "x"]
+ * Example: "arr[]"      => ["arr", "" ]  // "" indicates "push" onto array
+ */
+function parseKey(key) {
+    // The first segment is everything up to the first '[' (or the entire key if no '[')
+    const segments = [];
+    const topKeyMatch = key.match(/^([^[\]]+)/);
+    if (topKeyMatch) {
+        segments.push(topKeyMatch[1]);
+    }
+    else {
+        // If it starts with brackets, treat it as empty? (edge case)
+        segments.push('');
+    }
+    // Now capture all bracket parts: [something], [0], []
+    const bracketRegex = /\[([^[\]]*)\]/g;
+    let match;
+    while ((match = bracketRegex.exec(key)) !== null) {
+        // match[1] is the content inside the brackets
+        segments.push(match[1]);
+    }
+    return segments;
+}
+/**
+ * Recursively set a value in a nested object/array, given a path of segments.
+ * - If segment is numeric => treat as array index
+ * - If segment is empty "" => push to array
+ * - Else => object property
+ */
+function setValue(obj, path, value) {
+    let current = obj;
+    for (let i = 0; i < path.length; i++) {
+        const segment = path[i];
+        // If we're at the last segment, set the value
+        if (i === path.length - 1) {
+            if (segment === '') {
+                // Empty bracket => push
+                if (!Array.isArray(current)) {
+                    current = [];
+                }
+                current.push(value);
+            }
+            else if (!isNaN(Number(segment))) {
+                // Numeric segment => array index
+                const idx = Number(segment);
+                if (!Array.isArray(current)) {
+                    current = [];
+                }
+                current[idx] = value;
+            }
+            else {
+                // Object property
+                current[segment] = value;
+            }
+        }
+        else {
+            // Not the last segment: descend into existing structure or create it
+            const nextSegment = path[i + 1];
+            if (segment === '') {
+                // Empty bracket => push
+                if (!Array.isArray(current)) {
+                    // Convert the current node into an array, if not one
+                    current = [];
+                }
+                // If we are not at the last path, we need a placeholder object or array
+                // for the next segment. We'll push something and move current to that.
+                if (current.length === 0) {
+                    // nothing in array yet
+                    current.push(typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {});
+                }
+                else if (typeof nextSegment === 'string' && !isNaN(Number(nextSegment))) {
+                    // next is numeric => we want an array
+                    if (!Array.isArray(current[current.length - 1])) {
+                        current[current.length - 1] = [];
+                    }
+                }
+                else {
+                    // next is not numeric => we want an object
+                    if (typeof current[current.length - 1] !== 'object') {
+                        current[current.length - 1] = {};
+                    }
+                }
+                current = current[current.length - 1];
+            }
+            else if (!isNaN(Number(segment))) {
+                // segment is numeric => array index
+                const idx = Number(segment);
+                if (!Array.isArray(current)) {
+                    current = [];
+                }
+                if (current[idx] === undefined) {
+                    // Create placeholder for next segment
+                    current[idx] = typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {};
+                }
+                current = current[idx];
+            }
+            else {
+                // segment is an object key
+                if (current[segment] === undefined) {
+                    // Create placeholder
+                    current[segment] = typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {};
+                }
+                current = current[segment];
+            }
+        }
+    }
+}
+/**
+ * Deserialize a bracket-based query string into an object.
+ *
+ * Supports:
+ *   - Key/value pairs with nested brackets (e.g. "a[b][0]=value")
+ *   - Arrays with empty bracket (e.g. "arr[]=1&arr[]=2")
+ *   - Mixed arrays of objects, etc.
+ *
+ * @example
+ *   parseQuery("x=xx&y[0]=yy&y[1]=uu&z[f]=x&z[u][0]=uu&z[u][1]=xx&z[d][x]=ee")
+ *   => {
+ *        x: "xx",
+ *        y: ["yy", "uu"],
+ *        z: {
+ *          f: "x",
+ *          u: ["uu", "xx"],
+ *          d: { x: "ee" }
+ *        }
+ *      }
+ *
+ * @param queryString - The raw query string (e.g. location.search.slice(1))
+ * @returns           - A nested object representing the query params
+ */
+function parseQuery(queryString) {
+    const result = {};
+    if (!queryString)
+        return result;
+    // Split into key=value pairs
+    const pairs = queryString
+        .replace(/^\?/, '') // Remove leading "?" if present
+        .split('&');
+    for (const pair of pairs) {
+        const [rawKey, rawVal = ''] = pair.split('=');
+        const decodedKey = decodeURIComponent(rawKey || '');
+        const decodedVal = decodeURIComponent(rawVal);
+        // Parse bracket notation
+        const pathSegments = parseKey(decodedKey);
+        // Insert into the result object
+        setValue(result, pathSegments, decodedVal);
+    }
+    return result;
+}

package/dist/utils/reqQuery.js CHANGED Viewed

@@ -1,25 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = reqQuery;
-const createRPC_1 = require("../client/createRPC");
+const parseQuery_1 = __importDefault(require("./parseQuery"));
 function reqQuery(req) {
-    const queryArr = req.nextUrl.searchParams.get(createRPC_1.ARRAY_QUERY_KEY)?.split(',') ?? null;
-    const entries = [...req.nextUrl.searchParams.entries()];
-    const query = entries.reduce((acc, [key, value]) => {
-        if (key === createRPC_1.ARRAY_QUERY_KEY)
-            return acc;
-        if (queryArr?.includes(key)) {
-            if (!(key in acc)) {
-                acc[key] = [value];
-            }
-            else {
-                acc[key].push(value);
-            }
-        }
-        else {
-            acc[key] = value;
-        }
-        return acc;
-    }, {});
-    return query;
+    return (0, parseQuery_1.default)(req.nextUrl.search);
 }

package/dist/utils/serializeQuery.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import type { KnownAny } from '../types';
+/**
+ * Serialize a nested object (including arrays, arrays of objects, etc.)
+ * into a bracket-based query string.
+ *
+ * @example
+ *   serializeQuery({ x: 'xx', y: [1, 2], z: { f: 'x' } })
+ *   => "x=xx&y[0]=1&y[1]=2&z[f]=x"
+ *
+ * @param obj - The input object to be serialized
+ * @returns   - A bracket-based query string (without leading "?")
+ */
+export default function serializeQuery(obj: Record<string, KnownAny>): string;

package/dist/utils/serializeQuery.js ADDED Viewed

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = serializeQuery;
+/**
+ * Recursively build query parameters from an object.
+ *
+ * @param key      - The query key so far (e.g. 'user', 'user[0]', 'user[0][name]')
+ * @param value    - The current value to serialize
+ * @returns        - An array of `key=value` strings
+ */
+function buildParams(key, value) {
+    if (value === null || value === undefined) {
+        return []; // skip null/undefined values entirely
+    }
+    // If value is an object or array, we need to recurse
+    if (typeof value === 'object') {
+        // Array case
+        if (Array.isArray(value)) {
+            /**
+             * We use index-based bracket notation here:
+             *   e.g. for value = ['aa', 'bb'] and key = 'foo'
+             *   => "foo[0]=aa&foo[1]=bb"
+             *
+             * If you prefer "foo[]=aa&foo[]=bb" style, replace:
+             *   `${key}[${i}]`
+             * with:
+             *   `${key}[]`
+             */
+            return value.flatMap((v, i) => {
+                const newKey = `${key}[${i}]`;
+                return buildParams(newKey, v);
+            });
+        }
+        // Plain object case
+        return Object.keys(value).flatMap((k) => {
+            const newKey = `${key}[${k}]`;
+            return buildParams(newKey, value[k]);
+        });
+    }
+    return [`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`];
+}
+/**
+ * Serialize a nested object (including arrays, arrays of objects, etc.)
+ * into a bracket-based query string.
+ *
+ * @example
+ *   serializeQuery({ x: 'xx', y: [1, 2], z: { f: 'x' } })
+ *   => "x=xx&y[0]=1&y[1]=2&z[f]=x"
+ *
+ * @param obj - The input object to be serialized
+ * @returns   - A bracket-based query string (without leading "?")
+ */
+function serializeQuery(obj) {
+    if (!obj || typeof obj !== 'object')
+        return '';
+    // Collect query segments
+    const segments = [];
+    for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            const value = obj[key];
+            segments.push(...buildParams(key, value));
+        }
+    }
+    return segments.join('&');
+}

package/dist/worker/createWPC.d.ts CHANGED Viewed

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

package/dist/worker/createWPC.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWPC = createWPC;
-function createWPC(currentWorker, workerSchema) {
+function createWPC(workerSchema, currentWorker) {
     if (!workerSchema)
         throw new Error('Worker schema is not provided');
     const schema = workerSchema;
@@ -23,7 +23,7 @@ function createWPC(currentWorker, workerSchema) {
         instance.worker = worker;
         return instance;
     };
-    instance.fork = (worker) => createWPC(worker, schema);
+    instance.fork = (worker) => createWPC(schema, worker);
     for (const methodName of Object.keys(schema.handlers)) {
         const { isGenerator } = schema.handlers[methodName];
         if (isGenerator) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.52",
+  "version": "3.0.0-draft.53",
   "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/client/createRPC.ts CHANGED Viewed

@@ -10,9 +10,7 @@ import { type VovkClientOptions, type VovkClient, type VovkDefaultFetcherOptions
 import defaultFetcher from './defaultFetcher';
 import { defaultHandler } from './defaultHandler';
 import { defaultStreamHandler } from './defaultStreamHandler';
-// TODO Ugly workaround. Need your ideas how to distinguish between array and non-array query params
-export const ARRAY_QUERY_KEY = '_vovkarr';
+import serializeQuery from '../utils/serializeQuery';
 const trimPath = (path: string) => path.trim().replace(/^\/|\/$/g, '');
@@ -26,27 +24,9 @@ const getHandlerPath = <T extends ControllerStaticMethod>(
     result = result.replace(`:${key}`, value as string);
   }
-  const searchParams = new URLSearchParams();
-  let hasQuery = false;
-  const arrayKeys: string[] = [];
-  for (const [key, value] of Object.entries(query ?? {})) {
-    if (typeof value === 'undefined') continue;
-    if (value instanceof Array) {
-      arrayKeys.push(key);
-      for (const val of value) {
-        searchParams.append(key, val);
-      }
-    } else {
-      searchParams.set(key, value);
-    }
-    hasQuery = true;
-  }
-  if (arrayKeys.length) {
-    searchParams.set(ARRAY_QUERY_KEY, arrayKeys.join(','));
-  }
+  const queryStr = query ? serializeQuery(query) : null;
-  return `${result}${hasQuery ? '?' : ''}${searchParams.toString()}`;
+  return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
 export const createRPC = <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions>(

package/src/types.ts CHANGED Viewed

@@ -107,7 +107,7 @@ export interface VovkRequest<BODY = undefined, QUERY extends object | undefined
 }
 export type ControllerStaticMethod<
-  REQ extends VovkRequest<KnownAny, KnownAny> = VovkRequest<undefined, Record<string, string | string[]>>,
+  REQ extends VovkRequest<KnownAny, KnownAny> = VovkRequest<undefined, Record<string, KnownAny>>,
   PARAMS extends { [key: string]: string } = KnownAny,
 > = ((req: REQ, params: PARAMS) => unknown) & {
   _controller?: VovkController;

package/src/utils/parseQuery.ts ADDED Viewed

@@ -0,0 +1,160 @@
+import type { KnownAny } from '../types';
+/**
+ * Parse a bracket-based key (e.g. "z[d][0][x]" or "arr[]")
+ * into an array of path segments (strings or special push-markers).
+ *
+ * Example: "z[d][0][x]" => ["z", "d", "0", "x"]
+ * Example: "arr[]"      => ["arr", "" ]  // "" indicates "push" onto array
+ */
+function parseKey(key: string): string[] {
+  // The first segment is everything up to the first '[' (or the entire key if no '[')
+  const segments: string[] = [];
+  const topKeyMatch = key.match(/^([^[\]]+)/);
+  if (topKeyMatch) {
+    segments.push(topKeyMatch[1]);
+  } else {
+    // If it starts with brackets, treat it as empty? (edge case)
+    segments.push('');
+  }
+  // Now capture all bracket parts: [something], [0], []
+  const bracketRegex = /\[([^[\]]*)\]/g;
+  let match: RegExpExecArray | null;
+  while ((match = bracketRegex.exec(key)) !== null) {
+    // match[1] is the content inside the brackets
+    segments.push(match[1]);
+  }
+  return segments;
+}
+/**
+ * Recursively set a value in a nested object/array, given a path of segments.
+ * - If segment is numeric => treat as array index
+ * - If segment is empty "" => push to array
+ * - Else => object property
+ */
+function setValue(obj: Record<string, KnownAny>, path: string[], value: KnownAny): void {
+  let current: KnownAny = obj;
+  for (let i = 0; i < path.length; i++) {
+    const segment = path[i];
+    // If we're at the last segment, set the value
+    if (i === path.length - 1) {
+      if (segment === '') {
+        // Empty bracket => push
+        if (!Array.isArray(current)) {
+          current = [];
+        }
+        current.push(value);
+      } else if (!isNaN(Number(segment))) {
+        // Numeric segment => array index
+        const idx = Number(segment);
+        if (!Array.isArray(current)) {
+          current = [];
+        }
+        current[idx] = value;
+      } else {
+        // Object property
+        current[segment] = value;
+      }
+    } else {
+      // Not the last segment: descend into existing structure or create it
+      const nextSegment = path[i + 1];
+      if (segment === '') {
+        // Empty bracket => push
+        if (!Array.isArray(current)) {
+          // Convert the current node into an array, if not one
+          current = [];
+        }
+        // If we are not at the last path, we need a placeholder object or array
+        // for the next segment. We'll push something and move current to that.
+        if (current.length === 0) {
+          // nothing in array yet
+          current.push(typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {});
+        } else if (typeof nextSegment === 'string' && !isNaN(Number(nextSegment))) {
+          // next is numeric => we want an array
+          if (!Array.isArray(current[current.length - 1])) {
+            current[current.length - 1] = [];
+          }
+        } else {
+          // next is not numeric => we want an object
+          if (typeof current[current.length - 1] !== 'object') {
+            current[current.length - 1] = {};
+          }
+        }
+        current = current[current.length - 1];
+      } else if (!isNaN(Number(segment))) {
+        // segment is numeric => array index
+        const idx = Number(segment);
+        if (!Array.isArray(current)) {
+          current = [];
+        }
+        if (current[idx] === undefined) {
+          // Create placeholder for next segment
+          current[idx] = typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {};
+        }
+        current = current[idx];
+      } else {
+        // segment is an object key
+        if (current[segment] === undefined) {
+          // Create placeholder
+          current[segment] = typeof nextSegment === 'string' && !isNaN(Number(nextSegment)) ? [] : {};
+        }
+        current = current[segment];
+      }
+    }
+  }
+}
+/**
+ * Deserialize a bracket-based query string into an object.
+ *
+ * Supports:
+ *   - Key/value pairs with nested brackets (e.g. "a[b][0]=value")
+ *   - Arrays with empty bracket (e.g. "arr[]=1&arr[]=2")
+ *   - Mixed arrays of objects, etc.
+ *
+ * @example
+ *   parseQuery("x=xx&y[0]=yy&y[1]=uu&z[f]=x&z[u][0]=uu&z[u][1]=xx&z[d][x]=ee")
+ *   => {
+ *        x: "xx",
+ *        y: ["yy", "uu"],
+ *        z: {
+ *          f: "x",
+ *          u: ["uu", "xx"],
+ *          d: { x: "ee" }
+ *        }
+ *      }
+ *
+ * @param queryString - The raw query string (e.g. location.search.slice(1))
+ * @returns           - A nested object representing the query params
+ */
+export default function parseQuery(queryString: string): Record<string, KnownAny> {
+  const result: Record<string, KnownAny> = {};
+  if (!queryString) return result;
+  // Split into key=value pairs
+  const pairs = queryString
+    .replace(/^\?/, '') // Remove leading "?" if present
+    .split('&');
+  for (const pair of pairs) {
+    const [rawKey, rawVal = ''] = pair.split('=');
+    const decodedKey = decodeURIComponent(rawKey || '');
+    const decodedVal = decodeURIComponent(rawVal);
+    // Parse bracket notation
+    const pathSegments = parseKey(decodedKey);
+    // Insert into the result object
+    setValue(result, pathSegments, decodedVal);
+  }
+  return result;
+}

package/src/utils/reqQuery.ts CHANGED Viewed

@@ -1,26 +1,6 @@
-import { ARRAY_QUERY_KEY } from '../client/createRPC';
 import type { KnownAny, VovkRequest } from '../types';
+import parseQuery from './parseQuery';
 export default function reqQuery<T extends object | undefined>(req: VovkRequest<KnownAny, T>): T {
-  type Query = NonNullable<T>;
-  const queryArr = (req.nextUrl.searchParams.get(ARRAY_QUERY_KEY as keyof T) as string | undefined)?.split(',') ?? null;
-  const entries = [...req.nextUrl.searchParams.entries()] as [string, string][];
-  const query = entries.reduce(
-    (acc, [key, value]) => {
-      if (key === ARRAY_QUERY_KEY) return acc;
-      if (queryArr?.includes(key)) {
-        if (!(key in acc)) {
-          acc[key] = [value];
-        } else {
-          (acc[key] as string[]).push(value);
-        }
-      } else {
-        acc[key] = value;
-      }
-      return acc;
-    },
-    {} as Record<string, string | string[]>
-  );
-  return query as Query;
+  return parseQuery(req.nextUrl.search) as NonNullable<T>;
 }

package/src/utils/serializeQuery.ts ADDED Viewed

@@ -0,0 +1,69 @@
+import type { KnownAny } from '../types';
+/**
+ * Recursively build query parameters from an object.
+ *
+ * @param key      - The query key so far (e.g. 'user', 'user[0]', 'user[0][name]')
+ * @param value    - The current value to serialize
+ * @returns        - An array of `key=value` strings
+ */
+function buildParams(key: string, value: KnownAny): string[] {
+  if (value === null || value === undefined) {
+    return []; // skip null/undefined values entirely
+  }
+  // If value is an object or array, we need to recurse
+  if (typeof value === 'object') {
+    // Array case
+    if (Array.isArray(value)) {
+      /**
+       * We use index-based bracket notation here:
+       *   e.g. for value = ['aa', 'bb'] and key = 'foo'
+       *   => "foo[0]=aa&foo[1]=bb"
+       *
+       * If you prefer "foo[]=aa&foo[]=bb" style, replace:
+       *   `${key}[${i}]`
+       * with:
+       *   `${key}[]`
+       */
+      return value.flatMap((v, i) => {
+        const newKey = `${key}[${i}]`;
+        return buildParams(newKey, v);
+      });
+    }
+    // Plain object case
+    return Object.keys(value).flatMap((k) => {
+      const newKey = `${key}[${k}]`;
+      return buildParams(newKey, value[k]);
+    });
+  }
+  return [`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`];
+}
+/**
+ * Serialize a nested object (including arrays, arrays of objects, etc.)
+ * into a bracket-based query string.
+ *
+ * @example
+ *   serializeQuery({ x: 'xx', y: [1, 2], z: { f: 'x' } })
+ *   => "x=xx&y[0]=1&y[1]=2&z[f]=x"
+ *
+ * @param obj - The input object to be serialized
+ * @returns   - A bracket-based query string (without leading "?")
+ */
+export default function serializeQuery(obj: Record<string, KnownAny>): string {
+  if (!obj || typeof obj !== 'object') return '';
+  // Collect query segments
+  const segments: string[] = [];
+  for (const key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      const value = obj[key];
+      segments.push(...buildParams(key, value));
+    }
+  }
+  return segments.join('&');
+}

package/src/worker/createWPC.ts CHANGED Viewed

@@ -1,10 +1,7 @@
 import type { VovkWorkerSchema } from '../types';
 import type { WorkerInput, WorkerOutput, WorkerPromiseInstance } from './types';
-export function createWPC<T extends object>(
-  currentWorker: Worker | null,
-  workerSchema: object
-): WorkerPromiseInstance<T> {
+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 = {
@@ -26,7 +23,7 @@ export function createWPC<T extends object>(
     return instance;
   };
-  instance.fork = (worker: Worker) => createWPC<T>(worker, schema);
+  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];