@wxn0brp/db-core 0.11.1-alpha.2 → 0.11.2

package/dist/types/searchOpts.d.ts

@@ -57,10 +57,22 @@ export type TypeAndExistenceOperators<T = any> = {
 /** Array Operators with nested support */
 export type ArrayOperators<T = any> = {
     /** [1, 2, 3] includes 2 */
+    $arrInc?: {
+        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
+    };
+    /**
+     * @deprecated Use $arrInc instead.
+     */
     $arrinc?: {
         [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
     };
     /** [1, 2, 3] array includes all elements e.g. [1, 2] */
+    $arrIncAll?: {
+        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
+    };
+    /**
+     * @deprecated Use $arrIncAll instead.
+     */
     $arrincall?: {
         [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
     };

package/dist/types/updater.d.ts

@@ -3,11 +3,25 @@ import { DeepPartial, NestedValue } from "./utils.js";
 export type ArrayUpdater<T = any> = {
     /** [1,2] -> $push 3 -> [1,2,3] */
     $push?: NestedValue<T, any>;
-    /** [1,2] -> $pushset 2,3 -> [1,2,3] */
+    /** [1,2] -> $pushSet 2,3 -> [1,2,3] */
+    $pushSet?: NestedValue<T, any>;
+    /**
+     * @deprecated Use $pushSet instead.
+     */
     $pushset?: NestedValue<T, any>;
+    /** [1,2,3] -> $pushAll [2,3] -> [1,2,3] */
+    $pushAll?: NestedValue<T, any>;
+    /**
+     * @deprecated Use $pushAll instead.
+     */
+    $pushall?: NestedValue<T, any>;
     /** [1,2,3] -> $pull 2 -> [1,3] */
     $pull?: NestedValue<T, any>;
-    /** [1,2,2,3] -> $pullall [2] -> [1,3] */
+    /** [1,2,2,3] -> $pullAll [2] -> [1,3] */
+    $pullAll?: NestedValue<T, any>;
+    /**
+     * @deprecated Use $pullAll instead.
+     */
     $pullall?: NestedValue<T, any>;
 };
 /** Objects */

package/dist/utils/hasFieldsAdvanced.js

@@ -9,12 +9,6 @@ export function hasFieldsAdvanced(obj, fields) {
     }
     if (Object.keys(fields).length === 0)
         return true;
-    if ("$and" in fields) {
-        return fields["$and"].every((subFields) => hasFieldsAdvanced(obj, subFields));
-    }
-    if ("$or" in fields) {
-        return fields["$or"].some((subFields) => hasFieldsAdvanced(obj, subFields));
-    }
     const $fields = {};
     const subsetFields = {};
     Object.keys(fields).forEach(key => {
@@ -23,16 +17,27 @@ export function hasFieldsAdvanced(obj, fields) {
         else
             subsetFields[key] = fields[key];
     });
-    if (!checkConditions(obj, $fields))
+    // Shallow fields first
+    if (Object.keys(subsetFields).length && !hasFields(obj, subsetFields))
         return false;
-    if (!Object.keys(subsetFields).length)
+    // Direct fields only
+    if (Object.keys($fields).length === 0)
         return true;
-    return hasFields(obj, subsetFields);
-}
-function checkConditions(obj, fields) {
-    return (mainCheck(obj, fields) &&
-        checkNot(obj, fields) &&
-        checkSubset(obj, fields));
+    // Subset check
+    if ("$subset" in $fields && !hasFields(obj, $fields["$subset"]))
+        return false;
+    // Advanced operators
+    if (!mainCheck(obj, $fields))
+        return false;
+    if (!checkNot(obj, $fields))
+        return false;
+    if ("$and" in $fields) {
+        return $fields["$and"].every((subFields) => hasFieldsAdvanced(obj, subFields));
+    }
+    if ("$or" in $fields) {
+        return $fields["$or"].some((subFields) => hasFieldsAdvanced(obj, subFields));
+    }
+    return true;
 }
 function mainCheck(obj, fields) {
     return _for(fields, obj, {
@@ -79,27 +84,21 @@ function checkNot(obj, fields) {
     }
     return true;
 }
-function checkSubset(obj, fields) {
-    if ("$subset" in fields) {
-        const setFields = fields["$subset"];
-        return hasFields(obj, setFields);
-    }
-    return true;
-}
 function _for(fields, obj, opts) {
-    for (const [fieldRaw, fieldFn] of Object.entries(opts)) {
-        const field = "$" + fieldRaw;
-        if (field in fields) {
-            for (const [key, value] of Object.entries(fields[field])) {
-                const targetValue = obj?.[key];
-                if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-                    if (!deepCheck(value, targetValue, fieldFn))
-                        return false;
-                }
-                else {
-                    if (!fieldFn(targetValue, value, key))
-                        return false;
-                }
+    for (const [field, value] of Object.entries(fields)) {
+        const fieldRaw = field.slice(1);
+        const fieldFn = opts[fieldRaw];
+        if (!fieldFn)
+            continue;
+        for (const [key, val] of Object.entries(value)) {
+            const targetValue = obj?.[key];
+            if (typeof val === "object" && val !== null && !Array.isArray(val)) {
+                if (!deepCheck(val, targetValue, fieldFn))
+                    return false;
+            }
+            else {
+                if (!fieldFn(targetValue, val, key))
+                    return false;
             }
         }
     }

package/dist/utils/updateObject.js

@@ -110,20 +110,21 @@ function updateObject(obj, newVal) {
     return obj;
 }
 function _for(fields, obj, opts) {
-    for (const [fieldRaw, fieldFn] of Object.entries(opts)) {
-        const field = "$" + fieldRaw;
-        if (field in fields) {
-            for (const [key, value] of Object.entries(fields[field])) {
-                if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-                    if (!obj[key])
-                        obj[key] = {};
-                    deepUpdateCheck(value, obj[key], fieldFn);
-                }
-                else {
-                    const res = fieldFn(obj?.[key], value, key, obj);
-                    if (res !== undefined)
-                        obj[key] = res;
-                }
+    for (const [field, value] of Object.entries(fields)) {
+        const fieldRaw = field.slice(1);
+        const fieldFn = opts[fieldRaw];
+        if (!fieldFn)
+            continue;
+        for (const [key, val] of Object.entries(value)) {
+            if (typeof val === "object" && val !== null && !Array.isArray(val)) {
+                if (!obj[key])
+                    obj[key] = {};
+                deepUpdateCheck(val, obj[key], fieldFn);
+            }
+            else {
+                const res = fieldFn(obj?.[key], val, key, obj);
+                if (res !== undefined)
+                    obj[key] = res;
             }
         }
     }

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.11.1-alpha.2";
+export const version = "0.11.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.11.1-alpha.2",
+  "version": "0.11.2",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",