@wxn0brp/vql 0.10.1 → 0.10.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 wxn0brP
+Copyright (c) 2026 wxn0brP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/helpers/apiAbstract.js

@@ -1,4 +1,4 @@
-import CollectionManager from "@wxn0brp/db-core/helpers/CollectionManager";
+import { CollectionManager } from "@wxn0brp/db-core/helpers/collectionManager";
 import updateFindObject from "@wxn0brp/db-core/utils/updateFindObject";
 const list = [
     "ensureCollection", "issetCollection", "getCollections", "removeCollection",

package/dist/helpers/falconFrame.d.ts

@@ -1,10 +1,11 @@
 import { type VQLProcessor } from "../processor.js";
-import type { FalconFrame, FFRequest } from "@wxn0brp/falcon-frame";
-type ContextFn = (req: FFRequest) => Promise<any> | any;
+import type { FalconFrame, FFRequest, FFResponse } from "@wxn0brp/falcon-frame";
+export type ContextFn = (req: FFRequest, res: FFResponse) => Promise<any> | any;
 interface FF_VQL_Options {
+    /** @default "/VQL" */
     path?: string;
     getUser?: ContextFn;
     dev?: boolean;
 }
-export declare function FF_VQL(app: FalconFrame, processor: VQLProcessor, options?: FF_VQL_Options): void;
+export declare function FF_VQL(app: FalconFrame<any>, processor: VQLProcessor, options?: FF_VQL_Options): void;
 export {};

package/dist/helpers/falconFrame.js

@@ -1,10 +1,17 @@
 import { parseVQLS } from "../cpu/string/index.js";
+function formatMessage(e) {
+    return e instanceof Error
+        ? e.message
+        : typeof e === "string"
+            ? e
+            : JSON.stringify(e);
+}
 export function FF_VQL(app, processor, options = {}) {
     const path = options.path || "/VQL";
     const getContext = options.getUser || (() => ({}));
     app.post(path, async (req, res) => {
         try {
-            const ctx = await getContext(req);
+            const ctx = await getContext(req, res);
             const result = await processor.execute(req.body.query, ctx);
             if (result && result.err)
                 return result;
@@ -12,17 +19,17 @@ export function FF_VQL(app, processor, options = {}) {
         }
         catch (e) {
             res.status(500);
-            return { err: true, msg: e.message };
+            return { err: true, msg: formatMessage(e) };
         }
     });
     if (options.dev) {
         app.get(path + "-query", (req, res) => {
             try {
-                return res.json(parseVQLS(req.query?.query || ""));
+                return parseVQLS(req.query?.query || "");
             }
             catch (e) {
                 res.status(500);
-                return { err: true, msg: e.message };
+                return { err: true, msg: formatMessage(e) };
             }
         });
     }

package/dist/vql.d.ts

@@ -1,11 +1,5 @@
 // Generated by dts-bundle-generator v9.5.1
 
-export interface Data {
-	[key: string]: any;
-}
-export interface VContext {
-	[key: string]: any;
-}
 export type KeysMatching<T, V, C = V> = {
 	[K in keyof T]-?: T[K] extends C ? K : never;
 }[keyof T];
@@ -17,6 +11,7 @@ export type NestedValue<T, V, C = V> = {
 export type DeepPartial<T> = {
 	[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
+export type JSPrimitiveType = "string" | "number" | "boolean" | "bigint" | "symbol" | "undefined" | "function" | "object";
 /** Logical Operators */
 export type LogicalOperators<T = any> = {
 	/**
@@ -70,9 +65,9 @@ export type ComparisonOperators<T = any> = {
 /** Type and Existence Operators with nested support */
 export type TypeAndExistenceOperators<T = any> = {
 	/** "name" in { name: "John" } */
-	$exists?: NestedValue<T, boolean>;
+	$exists?: NestedValue<T, boolean, any>;
 	/** "name" == "string" in { name: "John" } */
-	$type?: NestedValue<T, string>;
+	$type?: NestedValue<T, JSPrimitiveType, any>;
 };
 /** Array Operators with nested support */
 export type ArrayOperators<T = any> = {
@@ -103,6 +98,9 @@ export type PredefinedSearchOperators<T = any> = LogicalOperators<T> & Compariso
  * SearchOptions can be either a function or an object with predefined operators.
  */
 export type SearchOptions<T = any> = PredefinedSearchOperators<T> & DeepPartial<T> & Record<string, any>;
+export interface VContext {
+	[key: string]: any;
+}
 /** Arrays */
 export type ArrayUpdater<T = any> = {
 	/** [1,2] -> $push 3 -> [1,2,3] */
@@ -146,6 +144,9 @@ export type SearchFunc<T = any> = (data: T, context: VContext) => boolean;
 export type UpdaterFunc<T = any> = (data: T, context: VContext) => boolean;
 export type Search<T = any> = SearchOptions<T> | SearchFunc<T>;
 export type Updater<T = any> = UpdaterArg<T> | UpdaterArg<T>[] | UpdaterFunc<T>;
+export interface Data {
+	[key: string]: any;
+}
 export interface DbFindOpts<T = any> {
 	reverse?: boolean;
 	limit?: number;
@@ -165,39 +166,39 @@ declare class CollectionManager<D = Data> {
 	/**
 	 * Add data to a database.
 	 */
-	add<T = Data>(data: Arg<T & D>, id_gen?: boolean): Promise<T>;
+	add(data: Arg<D>, id_gen?: boolean): Promise<D>;
 	/**
 	 * Find data in a database.
 	 */
-	find<T = Data>(search?: Search<T & D>, options?: DbFindOpts<T & D>, findOpts?: FindOpts<T & D>, context?: VContext): Promise<T[]>;
+	find(search?: Search<D>, options?: DbFindOpts<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D[]>;
 	/**
 	 * Find one data entry in a database.
 	 */
-	findOne<T = Data>(search?: Search<T & D>, findOpts?: FindOpts<T & D>, context?: VContext): Promise<T>;
+	findOne(search?: Search<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D>;
 	/**
 	 * Update data in a database.
 	 */
-	update<T = Data>(search: Search<T & D>, updater: Updater<T & D>, context?: VContext): Promise<boolean>;
+	update(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<boolean>;
 	/**
 	 * Update one data entry in a database.
 	 */
-	updateOne<T = Data>(search: Search<T & D>, updater: Updater<T & D>, context?: VContext): Promise<boolean>;
+	updateOne(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<boolean>;
 	/**
 	 * Remove data from a database.
 	 */
-	remove<T = Data>(search: Search<T & D>, context?: VContext): Promise<boolean>;
+	remove(search: Search<D>, context?: VContext): Promise<boolean>;
 	/**
 	 * Remove one data entry from a database.
 	 */
-	removeOne<T = Data>(search: Search<T & D>, context?: VContext): Promise<boolean>;
+	removeOne(search: Search<D>, context?: VContext): Promise<boolean>;
 	/**
 	 * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
 	 */
-	updateOneOrAdd<T = Data>(search: Search<T & D>, updater: Updater<T & D>, { add_arg, context, id_gen }: UpdateOneOrAdd<T & D>): Promise<boolean>;
+	updateOneOrAdd(search: Search<D>, updater: Updater<D>, { add_arg, context, id_gen }?: UpdateOneOrAdd<D>): Promise<boolean>;
 	/**
 	 * Asynchronously removes one entry in a database or adds a new one if it doesn't exist. Usage e.g. for toggling a flag.
 	 */
-	toggleOne<T = Data>(search: Search<T & D>, data?: Arg<T & D>, context?: VContext): Promise<boolean>;
+	toggleOne(search: Search<D>, data?: Arg<D>, context?: VContext): Promise<boolean>;
 }
 export interface ValtheraCompatible {
 	c(collection: string): CollectionManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "main": "dist/index.js",
   "author": "wxn0brP",
   "license": "MIT",
@@ -27,9 +27,9 @@
     "query-language"
   ],
   "peerDependencies": {
-    "@wxn0brp/db-core": ">=0.3.0",
-    "@wxn0brp/falcon-frame": ">=0.5.3",
-    "@wxn0brp/gate-warden": ">=0.5.0"
+    "@wxn0brp/db-core": ">=0.4.0",
+    "@wxn0brp/falcon-frame": ">=0.6.1",
+    "@wxn0brp/gate-warden": ">=0.5.3"
   },
   "peerDependenciesMeta": {
     "@wxn0brp/falcon-frame": {
@@ -45,10 +45,10 @@
   "devDependencies": {
     "@types/bun": "*",
     "@types/node": "*",
-    "@wxn0brp/db": "^0.41.0",
-    "@wxn0brp/db-core": "^0.3.0",
-    "@wxn0brp/falcon-frame": "^0.5.3",
-    "@wxn0brp/gate-warden": "^0.5.0",
+    "@wxn0brp/db": "^0.42.0",
+    "@wxn0brp/db-core": "^0.4.0",
+    "@wxn0brp/falcon-frame": "^0.6.1",
+    "@wxn0brp/gate-warden": "^0.5.3",
     "esbuild": "*",
     "tsc-alias": "*",
     "typescript": "*"