inibase 1.0.0-rc.80 → 1.0.0-rc.81

package/dist/utils.server.d.ts

@@ -62,36 +62,36 @@ export declare const hashString: (str: string) => string;
  *
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
- * @param comparedAtValue - The value or values to compare against.
+ * @param comparedValue - The value or values to compare against.
  * @param fieldType - Optional type of the field to guide comparison (e.g., 'password', 'boolean').
  * @param fieldChildrenType - Optional type for child elements in array inputs.
  * @returns boolean - Result of the comparison operation.
  *
  * Note: Handles various data types and comparison logic, including special handling for passwords and regex patterns.
  */
-export declare const compare: (operator: ComparisonOperator, originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[]) => boolean;
+export declare const compare: (operator: ComparisonOperator, originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType | FieldType[], fieldChildrenType?: FieldType | FieldType[]) => boolean;
 /**
  * Helper function to check equality based on the field type.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value to compare against.
+ * @param comparedValue - The value to compare against.
  * @param fieldType - Type of the field.
  * @returns boolean - Result of the equality check.
  */
-export declare const isEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType | FieldType[]) => boolean;
+export declare const isEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType) => boolean;
 /**
  * Helper function to check array equality.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value to compare against.
+ * @param comparedValue - The value to compare against.
  * @returns boolean - Result of the array equality check.
  */
-export declare const isArrayEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[]) => boolean;
+export declare const isArrayEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[]) => boolean;
 /**
  * Helper function to check wildcard pattern matching using regex.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value with wildcard pattern.
+ * @param comparedValue - The value with wildcard pattern.
  * @returns boolean - Result of the wildcard pattern matching.
  */
-export declare const isWildcardMatch: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedAtValue: string | number | boolean | null | (string | number | boolean | null)[]) => boolean;
+export declare const isWildcardMatch: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[]) => boolean;

package/dist/utils.server.js

@@ -139,122 +139,120 @@ export const hashString = (str) => createHash("sha256").update(str).digest("hex"
  *
  * @param operator - The comparison operator (e.g., '=', '!=', '>', '<', '>=', '<=', '[]', '![]', '*', '!*').
  * @param originalValue - The value to compare, can be a single value or an array of values.
- * @param comparedAtValue - The value or values to compare against.
+ * @param comparedValue - The value or values to compare against.
  * @param fieldType - Optional type of the field to guide comparison (e.g., 'password', 'boolean').
  * @param fieldChildrenType - Optional type for child elements in array inputs.
  * @returns boolean - Result of the comparison operation.
  *
  * Note: Handles various data types and comparison logic, including special handling for passwords and regex patterns.
  */
-export const compare = (operator, originalValue, comparedAtValue, fieldType, fieldChildrenType) => {
+export const compare = (operator, originalValue, comparedValue, fieldType, fieldChildrenType) => {
     // Determine the field type if it's an array of potential types.
     if (Array.isArray(fieldType)) {
         fieldType = detectFieldType(String(originalValue), fieldType);
     }
     // Handle comparisons involving arrays.
-    if (Array.isArray(comparedAtValue) && !["[]", "![]"].includes(operator)) {
-        return comparedAtValue.some((comparedAtValueSingle) => compare(operator, originalValue, comparedAtValueSingle, fieldType));
+    if (Array.isArray(comparedValue) && !["[]", "![]"].includes(operator)) {
+        return comparedValue.some((value) => compare(operator, originalValue, value, fieldType));
     }
     // Switch statement for different comparison operators.
     switch (operator) {
         // Equal (Case Insensitive for strings, specific handling for passwords and booleans).
         case "=":
-            return isEqual(originalValue, comparedAtValue, fieldType);
+            return isEqual(originalValue, comparedValue, fieldType);
         // Not Equal.
         case "!=":
-            return !isEqual(originalValue, comparedAtValue, fieldType);
+            return !isEqual(originalValue, comparedValue, fieldType);
         // Greater Than.
         case ">":
-            return (originalValue !== null &&
-                comparedAtValue !== null &&
-                originalValue > comparedAtValue);
+            return compareNonNullValues(originalValue, comparedValue, (a, b) => a > b);
         // Less Than.
         case "<":
-            return (originalValue !== null &&
-                comparedAtValue !== null &&
-                originalValue < comparedAtValue);
+            return compareNonNullValues(originalValue, comparedValue, (a, b) => a < b);
         // Greater Than or Equal.
         case ">=":
-            return (originalValue !== null &&
-                comparedAtValue !== null &&
-                originalValue >= comparedAtValue);
+            return compareNonNullValues(originalValue, comparedValue, (a, b) => a >= b);
         // Less Than or Equal.
         case "<=":
-            return (originalValue !== null &&
-                comparedAtValue !== null &&
-                originalValue <= comparedAtValue);
+            return compareNonNullValues(originalValue, comparedValue, (a, b) => a <= b);
         // Array Contains (equality check for arrays).
         case "[]":
-            return isArrayEqual(originalValue, comparedAtValue);
+            return isArrayEqual(originalValue, comparedValue);
         // Array Does Not Contain.
         case "![]":
-            return !isArrayEqual(originalValue, comparedAtValue);
+            return !isArrayEqual(originalValue, comparedValue);
         // Wildcard Match (using regex pattern).
         case "*":
-            return isWildcardMatch(originalValue, comparedAtValue);
+            return isWildcardMatch(originalValue, comparedValue);
         // Not Wildcard Match.
         case "!*":
-            return !isWildcardMatch(originalValue, comparedAtValue);
+            return !isWildcardMatch(originalValue, comparedValue);
         // Unsupported operator.
         default:
             throw new Error(`Unsupported operator: ${operator}`);
     }
 };
+/**
+ * Helper function to handle non-null comparisons.
+ */
+const compareNonNullValues = (originalValue, comparedValue, comparator) => {
+    return (originalValue !== null &&
+        comparedValue !== null &&
+        comparator(originalValue, comparedValue));
+};
 /**
  * Helper function to check equality based on the field type.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value to compare against.
+ * @param comparedValue - The value to compare against.
  * @param fieldType - Type of the field.
  * @returns boolean - Result of the equality check.
  */
-export const isEqual = (originalValue, comparedAtValue, fieldType) => {
-    // Switch based on the field type for specific handling.
+export const isEqual = (originalValue, comparedValue, fieldType) => {
     switch (fieldType) {
-        // Password comparison.
         case "password":
-            return isPassword(originalValue) && typeof comparedAtValue === "string"
-                ? comparePassword(originalValue, comparedAtValue)
+            return isPassword(originalValue) && typeof comparedValue === "string"
+                ? comparePassword(originalValue, comparedValue)
                 : false;
-        // Boolean comparison.
         case "boolean":
-            return Number(originalValue) === Number(comparedAtValue);
-        // Default comparison.
+            return Number(originalValue) === Number(comparedValue);
         default:
-            return originalValue == comparedAtValue;
+            return originalValue == comparedValue;
     }
 };
 /**
  * Helper function to check array equality.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value to compare against.
+ * @param comparedValue - The value to compare against.
  * @returns boolean - Result of the array equality check.
  */
-export const isArrayEqual = (originalValue, comparedAtValue) => {
-    return ((Array.isArray(originalValue) &&
-        Array.isArray(comparedAtValue) &&
-        originalValue.some((v) => comparedAtValue.includes(v))) ||
-        (Array.isArray(originalValue) &&
-            !Array.isArray(comparedAtValue) &&
-            originalValue.includes(comparedAtValue)) ||
-        (!Array.isArray(originalValue) &&
-            Array.isArray(comparedAtValue) &&
-            comparedAtValue.includes(originalValue)) ||
-        (!Array.isArray(originalValue) &&
-            !Array.isArray(comparedAtValue) &&
-            comparedAtValue === originalValue));
+export const isArrayEqual = (originalValue, comparedValue) => {
+    if (Array.isArray(originalValue) && Array.isArray(comparedValue)) {
+        return originalValue.some((v) => comparedValue.includes(v));
+    }
+    if (Array.isArray(originalValue)) {
+        return originalValue.includes(comparedValue);
+    }
+    if (Array.isArray(comparedValue)) {
+        return comparedValue.includes(originalValue);
+    }
+    return originalValue === comparedValue;
 };
 /**
  * Helper function to check wildcard pattern matching using regex.
  *
  * @param originalValue - The original value.
- * @param comparedAtValue - The value with wildcard pattern.
+ * @param comparedValue - The value with wildcard pattern.
  * @returns boolean - Result of the wildcard pattern matching.
  */
-export const isWildcardMatch = (originalValue, comparedAtValue) => {
-    const wildcardPattern = `^${(String(comparedAtValue).includes("%")
-        ? String(comparedAtValue)
-        : `%${String(comparedAtValue)}%`).replace(/%/g, ".*")}$`;
-    return new RegExp(wildcardPattern, "i").test(String(originalValue));
+export const isWildcardMatch = (originalValue, comparedValue) => {
+    const comparedValueStr = String(comparedValue);
+    const originalValueStr = String(originalValue);
+    if (!comparedValueStr.includes("%") &&
+        (comparedValueStr === originalValueStr ||
+            comparedValueStr.toLowerCase() === originalValueStr.toLowerCase()))
+        return true;
+    const wildcardPattern = `^${(comparedValueStr.includes("%") ? comparedValueStr : `%${comparedValueStr}%`).replace(/%/g, ".*")}$`;
+    return new RegExp(wildcardPattern, "i").test(originalValueStr);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.80",
+  "version": "1.0.0-rc.81",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",