@wxn0brp/vql 0.8.3 → 0.8.4

package/dist/cpu/request.js

@@ -51,6 +51,10 @@ export async function executeQuery(cpu, query, user) {
             opts.id_gen = params.id_gen;
         return db.updateOneOrAdd(params.collection, params.search, params.updater, opts);
     }
+    else if (operation === "toggleOne") {
+        const params = query.d[operation];
+        return db.toggleOne(params.collection, params.search, params.data);
+    }
     else if (operation === "removeCollection") {
         const params = query.d[operation];
         return db.removeCollection(params.collection);

package/dist/cpu/string/args.d.ts

@@ -0,0 +1 @@
+export declare function parseArgs(input: string): Record<string, any>;

package/dist/cpu/string/args.js

@@ -0,0 +1,102 @@
+export function parseArgs(input) {
+    const result = {};
+    const tokens = [];
+    let current = "";
+    let inQuotes = false;
+    let escape = false;
+    let objTree = 0;
+    for (let i = 0; i < input.length; i++) {
+        const char = input[i];
+        if (escape) {
+            current += char;
+            escape = false;
+        }
+        else if (char === "\\") {
+            escape = true;
+        }
+        else if (!inQuotes && (char === "{" || char === "[")) {
+            objTree++;
+            current += char;
+        }
+        else if (!inQuotes && (char === "}" || char === "]")) {
+            objTree--;
+            current += char;
+            if (objTree === 0) {
+                tokens.push(current);
+                current = "";
+            }
+        }
+        else if (!objTree && (char === "'" || char === '"' || char === "`")) {
+            if (inQuotes === char) {
+                inQuotes = false;
+                tokens.push(`"` + current + `"`);
+                current = "";
+            }
+            else if (typeof inQuotes === "boolean") {
+                inQuotes = char;
+            }
+            else {
+                current += char;
+            }
+        }
+        else if (!inQuotes && (char === " " || char === "=" || char === "<" || char === ">")) {
+            if (current !== "") {
+                if (char === "<" || char === ">") {
+                    let type = char === ">" ? "gt" : "lt";
+                    if (i < input.length - 1 && input[i + 1] === "=") {
+                        type += "e";
+                        i++;
+                    }
+                    const split = current.split(".");
+                    if (split.length > 1) {
+                        const original = split.shift();
+                        const operation = "$" + type;
+                        split.unshift(operation);
+                        split.unshift(original);
+                        current = split.join(".");
+                    }
+                    else {
+                        current = "$" + type + "." + current;
+                    }
+                }
+                tokens.push(current);
+                current = "";
+            }
+        }
+        else {
+            current += char;
+        }
+    }
+    if (current !== "")
+        tokens.push(current);
+    for (let i = 0; i < tokens.length; i += 2) {
+        const key = tokens[i];
+        let value = tokens[i + 1] ?? true;
+        if (typeof value === "string") {
+            const trimmed = value.trim();
+            if (trimmed === "") {
+                value = true;
+            }
+            else if (/^".*"$/.test(trimmed)) {
+                value = trimmed.slice(1, -1);
+            }
+            else if (trimmed.toLowerCase() === "true") {
+                value = true;
+            }
+            else if (trimmed.toLowerCase() === "false") {
+                value = false;
+            }
+            else if (!isNaN(Number(trimmed))) {
+                value = Number(trimmed);
+            }
+            else if ((trimmed.startsWith("{") && trimmed.endsWith("}")) || (trimmed.startsWith("[") && trimmed.endsWith("]"))) {
+                try {
+                    value = JSON.parse(trimmed);
+                }
+                catch { }
+            }
+        }
+        result[key] = value;
+    }
+    return result;
+}

package/dist/cpu/string/build.d.ts

@@ -0,0 +1,2 @@
+import { VQL_Query } from "../../types/vql.js";
+export declare function buildVQL(db: string, op: string, collection: string, query: Record<string, any>): VQL_Query;

package/dist/cpu/string/build.js

@@ -0,0 +1,44 @@
+import { convertSearchObjToSearchArray } from "./utils.js";
+export function buildVQL(db, op, collection, query) {
+    return "relations" in query ?
+        buildRelation(db, collection, query) :
+        buildQuery(db, op, collection, query);
+}
+function buildRelation(db, collection, query) {
+    const relations = {};
+    for (const key in query.relations) {
+        const value = query.relations[key];
+        relations[key] = {
+            path: [value.db || db, value.c || key],
+            ...value
+        };
+        delete relations[key].db;
+        delete relations[key].c;
+    }
+    if ("select" in query)
+        query.select = convertSearchObjToSearchArray(query.select);
+    return {
+        r: {
+            path: [db, collection],
+            ...query,
+            relations,
+        }
+    };
+}
+function buildQuery(db, op, collection, query) {
+    if (query.fields && !query.select) {
+        query.select = query.fields;
+        delete query.fields;
+    }
+    if ("select" in query)
+        query.select = [...new Set(convertSearchObjToSearchArray(query.select).map(k => k[0]).flat())];
+    return {
+        db,
+        d: {
+            [op]: {
+                collection,
+                ...query,
+            }
+        }
+    };
+}

package/dist/cpu/string/index.js

@@ -1,4 +1,6 @@
-import { convertSearchObjToSearchArray, extractMeta } from "./utils.js";
+import { parseArgs } from "./args.js";
+import { buildVQL } from "./build.js";
+import { extractMeta } from "./utils.js";
 const aliases = {
     s: "search",
     f: "fields",
@@ -8,152 +10,6 @@ const aliases = {
     e: "select",
     u: "updater",
 };
-function parseArgs(input) {
-    const result = {};
-    const tokens = [];
-    let current = "";
-    let inQuotes = false;
-    let escape = false;
-    let objTree = 0;
-    for (let i = 0; i < input.length; i++) {
-        const char = input[i];
-        if (escape) {
-            current += char;
-            escape = false;
-        }
-        else if (char === "\\") {
-            escape = true;
-        }
-        else if (!inQuotes && (char === "{" || char === "[")) {
-            objTree++;
-            current += char;
-        }
-        else if (!inQuotes && (char === "}" || char === "]")) {
-            objTree--;
-            current += char;
-            if (objTree === 0) {
-                tokens.push(current);
-                current = "";
-            }
-        }
-        else if (!objTree && (char === "'" || char === '"' || char === "`")) {
-            if (inQuotes === char) {
-                inQuotes = false;
-                tokens.push(`"` + current + `"`);
-                current = "";
-            }
-            else if (typeof inQuotes === "boolean") {
-                inQuotes = char;
-            }
-            else {
-                current += char;
-            }
-        }
-        else if (!inQuotes && (char === " " || char === "=" || char === "<" || char === ">")) {
-            if (current !== "") {
-                if (char === "<" || char === ">") {
-                    let type = char === ">" ? "gt" : "lt";
-                    if (i < input.length - 1 && input[i + 1] === "=") {
-                        type += "e";
-                        i++;
-                    }
-                    const split = current.split(".");
-                    if (split.length > 1) {
-                        const original = split.shift();
-                        const operation = "$" + type;
-                        split.unshift(operation);
-                        split.unshift(original);
-                        current = split.join(".");
-                    }
-                    else {
-                        current = "$" + type + "." + current;
-                    }
-                }
-                tokens.push(current);
-                current = "";
-            }
-        }
-        else {
-            current += char;
-        }
-    }
-    if (current !== "") {
-        tokens.push(current);
-    }
-    for (let i = 0; i < tokens.length; i += 2) {
-        const key = tokens[i];
-        let value = tokens[i + 1] ?? true;
-        if (typeof value === "string") {
-            const trimmed = value.trim();
-            if (trimmed === "") {
-                value = true;
-            }
-            else if (/^".*"$/.test(trimmed)) {
-                value = trimmed.slice(1, -1);
-            }
-            else if (trimmed.toLowerCase() === "true") {
-                value = true;
-            }
-            else if (trimmed.toLowerCase() === "false") {
-                value = false;
-            }
-            else if (!isNaN(Number(trimmed))) {
-                value = Number(trimmed);
-            }
-            else if ((trimmed.startsWith("{") && trimmed.endsWith("}")) || (trimmed.startsWith("[") && trimmed.endsWith("]"))) {
-                try {
-                    value = JSON.parse(trimmed);
-                }
-                catch { }
-            }
-        }
-        result[key] = value;
-    }
-    return result;
-}
-function buildVQL(db, op, collection, query) {
-    const hasRelations = "relations" in query;
-    if (hasRelations) {
-        const relations = {};
-        for (const key in query.relations) {
-            const value = query.relations[key];
-            relations[key] = {
-                path: [value.db || db, value.c || key],
-                ...value
-            };
-            delete relations[key].db;
-            delete relations[key].c;
-        }
-        if ("select" in query) {
-            query.select = convertSearchObjToSearchArray(query.select);
-        }
-        return {
-            r: {
-                path: [db, collection],
-                ...query,
-                relations,
-            }
-        };
-    }
-    else {
-        if (query.fields && !query.select) {
-            query.select = query.fields;
-            delete query.fields;
-        }
-        if ("select" in query) {
-            query.select = [...new Set(convertSearchObjToSearchArray(query.select).map(k => k[0]).flat())];
-        }
-        return {
-            db,
-            d: {
-                [op]: {
-                    collection,
-                    ...query,
-                }
-            }
-        };
-    }
-}
 export function parseVQLS(query) {
     const { db, op, collection, body } = extractMeta(query);
     const parsed = parseArgs(body);
@@ -167,7 +23,9 @@ export function parseVQLS(query) {
             const key = keys[i];
             if (i < keys.length - 1) {
                 if (!(key in obj)) {
-                    obj[key] = {};
+                    const nextKey = keys[i + 1];
+                    const isArrayIndex = /^\d+$/.test(nextKey);
+                    obj[key] = isArrayIndex ? [] : {};
                 }
                 obj = obj[key];
             }

package/dist/cpu/string/utils.js

@@ -2,13 +2,15 @@ const opPrefix = {
     "-": "remove",
     "+": "add",
     "~": "update",
+    "?": "updateOneOrAdd",
+    "^": "toggleOne"
 };
 const operations = [
     "add",
     "find", "findOne",
     "update", "updateOne",
     "remove", "removeOne",
-    "updateOneOrAdd",
+    "updateOneOrAdd", "toggleOne",
     "ensureCollection", "issetCollection",
 ];
 /**
@@ -55,7 +57,7 @@ export function extractMeta(input) {
     let collection = "";
     let body = "";
     // Determine operation and collection based on special characters
-    if (["!", "-", "+", "~"].some(c => split[0].includes(c)) || // Check if operation is indicated by special character
+    if (["!", "-", "+", "~", "?", "^"].some(c => split[0].includes(c)) || // Check if operation is indicated by special character
         [".", ":", "{"].some(c => split[1].includes(c)) // Check if query body is indicated by special character
     ) {
         let temp = split.shift();
@@ -93,7 +95,7 @@ export function convertSearchObjToSearchArray(obj, parentKeys = []) {
         if (!value) {
             return acc;
         }
-        else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+        else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
             return [...acc, ...convertSearchObjToSearchArray(value, currentPath)];
         }
         else {

package/dist/helpers/valid.js

@@ -131,6 +131,15 @@ function validD(query) {
             return emptyErr("'updateOneOrAdd' operation 'id_gen' property must be a boolean.");
         return true;
     }
+    if (key === "toggleOne") {
+        const op = d.toggleOne;
+        if (!isObj(op.search, false))
+            return emptyErr("'toggleOne' operation requires a 'search' object.");
+        if ("data" in op && !isObj(op.data, false))
+            return emptyErr("'toggleOne' operation 'data' property must be an object.");
+        return true;
+    }
+    const n = key;
     return emptyErr(`Unknown or invalid CRUD operation: '${key}'`);
 }
 export function validateVql(query) {

package/dist/permissions/request.js

@@ -34,12 +34,19 @@ export async function extractPaths(config, query) {
             permPaths.paths.push({ filed: extractPathsFromData(qo.search), p: PermCRUD.READ });
             permPaths.paths.push({ filed: extractPathsFromData(qo.updater), p: PermCRUD.UPDATE });
             break;
+        case "toggleOne":
+            permPaths.paths.push({ c: PermCRUD.DELETE });
+            permPaths.paths.push({ c: PermCRUD.CREATE });
+            break;
         case "ensureCollection":
         case "getCollections":
         case "issetCollection":
         case "removeCollection":
             permPaths.paths.push({ c: PermCRUD.COLLECTION });
             break;
+        default:
+            const n = operation;
+            break;
     }
     permPaths.paths = (await Promise.all(permPaths.paths.map(async (path) => {
         if (!path.filed)

package/dist/types/vql.d.ts

@@ -39,6 +39,11 @@ export interface VQL_OP_UpdateOneOrAdd<T = any> {
     add_arg?: Arg<T>;
     id_gen?: boolean;
 }
+export interface VQL_OP_ToggleOne<T = any> {
+    collection: string;
+    search: Search<T>;
+    data?: Arg<T>;
+}
 export interface VQL_OP_CollectionOperation {
     collection: string;
 }
@@ -61,6 +66,8 @@ export type VQL_Query_CRUD_Data<T = any> = {
     removeOne: VQL_OP_Remove<T>;
 } | {
     updateOneOrAdd: VQL_OP_UpdateOneOrAdd<T>;
+} | {
+    toggleOne: VQL_OP_ToggleOne<T>;
 } | {
     removeCollection: VQL_OP_CollectionOperation;
 } | {
@@ -70,6 +77,7 @@ export type VQL_Query_CRUD_Data<T = any> = {
 } | {
     getCollections: {};
 };
+export type VQL_Query_CRUD_Keys = VQL_Query_CRUD_Data extends infer U ? U extends Record<string, unknown> ? keyof U : never : never;
 export interface VQL_Query_CRUD<T = any> {
     db: string;
     d: VQL_Query_CRUD_Data<T>;

package/dist/vql.d.ts

@@ -41,6 +41,10 @@ export type ComparisonOperators<T = any> = {
 	], number>;
 	$in?: Partial<Record<keyof T, T[keyof T][]>>;
 	$nin?: Partial<Record<keyof T, T[keyof T][]>>;
+	$idGt?: PartialOfType<T, string | number>;
+	$idLt?: PartialOfType<T, string | number>;
+	$idGte?: PartialOfType<T, string | number>;
+	$idLte?: PartialOfType<T, string | number>;
 };
 /** Type and Existence Operators */
 export type TypeAndExistenceOperators<T = any> = {
@@ -79,7 +83,8 @@ export type ArrayUpdater<T = any> = {
 };
 /** Objects */
 export type ObjectUpdater<T = any> = {
-	$merge?: PartialOfType<T, any[]>;
+	$merge?: PartialOfType<T, any>;
+	$deepMerge?: PartialOfType<T, any>;
 };
 /** Values */
 export type ValueUpdater<T = any> = {
@@ -87,6 +92,8 @@ export type ValueUpdater<T = any> = {
 	$dec?: PartialOfType<T, number>;
 	$unset?: PartialOfType<T, any>;
 	$rename?: PartialOfType<T, any>;
+	/** same as { name: value } */
+	$set?: PartialOfType<T, any>;
 };
 export type UpdaterArg<T = any> = ArrayUpdater<T> & ObjectUpdater<T> & ValueUpdater<T> & Arg<T>;
 export type Arg<T = any> = {
@@ -159,6 +166,7 @@ export interface ValtheraCompatible {
 	removeOne<T = Data>(collection: string, search: Search<T>, context?: VContext): Promise<boolean>;
 	removeCollection(collection: string): Promise<boolean>;
 	updateOneOrAdd<T = Data>(collection: string, search: Search<T>, updater: Updater<T>, opts?: UpdateOneOrAdd<T>): Promise<boolean>;
+	toggleOne<T = Data>(collection: string, search: Search<T>, data?: Arg<T>, context?: VContext): Promise<boolean>;
 }
 export interface UpdateOneOrAdd<T> {
 	add_arg?: Arg<T>;
@@ -231,6 +239,11 @@ export interface VQL_OP_UpdateOneOrAdd<T = any> {
 	add_arg?: Arg<T>;
 	id_gen?: boolean;
 }
+export interface VQL_OP_ToggleOne<T = any> {
+	collection: string;
+	search: Search<T>;
+	data?: Arg<T>;
+}
 export interface VQL_OP_CollectionOperation {
 	collection: string;
 }
@@ -253,6 +266,8 @@ export type VQL_Query_CRUD_Data<T = any> = {
 	removeOne: VQL_OP_Remove<T>;
 } | {
 	updateOneOrAdd: VQL_OP_UpdateOneOrAdd<T>;
+} | {
+	toggleOne: VQL_OP_ToggleOne<T>;
 } | {
 	removeCollection: VQL_OP_CollectionOperation;
 } | {
@@ -262,6 +277,7 @@ export type VQL_Query_CRUD_Data<T = any> = {
 } | {
 	getCollections: {};
 };
+export type VQL_Query_CRUD_Keys = VQL_Query_CRUD_Data extends infer U ? U extends Record<string, unknown> ? keyof U : never : never;
 export interface VQL_Query_CRUD<T = any> {
 	db: string;
 	d: VQL_Query_CRUD_Data<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "main": "dist/index.js",
   "author": "wxn0brP",
   "license": "MIT",
@@ -27,9 +27,9 @@
     "query-language"
   ],
   "peerDependencies": {
-    "@wxn0brp/db-core": ">=0.2.5",
-    "@wxn0brp/falcon-frame": ">=0.5.1",
-    "@wxn0brp/gate-warden": ">=0.4.1"
+    "@wxn0brp/db-core": ">=0.2.11",
+    "@wxn0brp/falcon-frame": ">=0.5.3",
+    "@wxn0brp/gate-warden": ">=0.5.0"
   },
   "peerDependenciesMeta": {
     "@wxn0brp/falcon-frame": {
@@ -43,17 +43,18 @@
     }
   },
   "devDependencies": {
+    "@types/bun": "*",
     "@types/node": "*",
-    "@wxn0brp/db": "^0.40.1",
-    "@wxn0brp/db-core": "^0.2.5",
-    "@wxn0brp/falcon-frame": "^0.5.1",
-    "@wxn0brp/gate-warden": "^0.4.1",
-    "esbuild": "^0.25.11",
+    "@wxn0brp/db": "^0.40.3",
+    "@wxn0brp/db-core": "^0.2.11",
+    "@wxn0brp/falcon-frame": "^0.5.3",
+    "@wxn0brp/gate-warden": "^0.5.0",
+    "esbuild": "*",
     "tsc-alias": "*",
     "typescript": "*"
   },
   "dependencies": {
-    "@wxn0brp/lucerna-log": "^0.2.1"
+    "@wxn0brp/lucerna-log": "^0.2.2"
   },
   "exports": {
     ".": {