#237 🐘 fix fn comparator type, allow string for regExp comparator, better argument names for fn, haveEntries, inRange, regExp

Author: RiceWithMeat

packages/server/src/core/entities/handlers/fn.ts

@@ -1,6 +1,6 @@
-import type { Comparator } from '@/utils/types';
+import type { FnComparator } from '@/utils/helpers';
 
 import { createComparator } from '@/utils/helpers';
 
-export const fn = (expected: Comparator) =>
-  createComparator((actual, { fn }) => fn(actual, expected));
+export const fn = (comparator: FnComparator) =>
+  createComparator((actual, { fn }) => fn(actual, createComparator(comparator)));

packages/server/src/core/entities/handlers/haveEntries.ts

@@ -2,5 +2,5 @@ import type { PlainObject } from '@/utils/types';
 
 import { createComparator } from '@/utils/helpers';
 
-export const haveEntries = (expected: any[] | PlainObject) =>
-  createComparator((actual, { haveEntries }) => haveEntries(actual, expected));
+export const haveEntries = (entry: any[] | PlainObject) =>
+  createComparator((actual, { haveEntries }) => haveEntries(actual, entry));

packages/server/src/core/entities/handlers/haveType.ts

@@ -1,6 +1,6 @@
-import type { HaveTypeTypes } from '@/utils/helpers';
+import type { HaveTypeType } from '@/utils/helpers';
 
 import { createComparator } from '@/utils/helpers';
 
-export const haveType = (expected: HaveTypeTypes) =>
-  createComparator((actual, { haveType }) => haveType(actual, expected));
+export const haveType = (type: HaveTypeType) =>
+  createComparator((actual, { haveType }) => haveType(actual, type));

packages/server/src/core/entities/handlers/inRange.ts

@@ -1,4 +1,4 @@
 import { createComparator } from '@/utils/helpers';
 
-export const inRange = (expected: [number, number]) =>
-  createComparator((actual, { inRange }) => inRange(actual, expected));
+export const inRange = (range: [number, number]) =>
+  createComparator((actual, { inRange }) => inRange(actual, range));

packages/server/src/core/entities/handlers/regExp.ts

@@ -1,4 +1,4 @@
 import { createComparator } from '@/utils/helpers';
 
-export const regExp = (expected: RegExp) =>
-  createComparator((actual, { regExp }) => regExp(actual, expected));
+export const regExp = (regExpLike: string | RegExp) =>
+  createComparator((actual, { regExp }) => regExp(actual, regExpLike));

packages/server/src/utils/helpers/entities/resolveEntityValues/resolveEntityValues.ts

@@ -52,7 +52,9 @@ const compareComplex = (
   );
 };
 
-export type HaveTypeTypes =
+export type FnComparator = <Actual = unknown>(actual: Actual, comparators: Comparators) => boolean;
+
+export type HaveTypeType =
   | 'array'
   | 'bigint'
   | 'boolean'
@@ -65,7 +67,7 @@ export type HaveTypeTypes =
   | 'undefined';
 
 const comparators = {
-  fn: (actual: unknown, expected: Comparator) => expected(actual, comparators),
+  fn: (actual: unknown, comparator: Comparator) => comparator(actual, comparators),
 
   exists: (actual: unknown) => actual !== undefined,
 
@@ -100,7 +102,8 @@ const comparators = {
     return false;
   },
 
-  regExp: (actual: unknown, expected: RegExp) => new RegExp(expected).test(String(actual)),
+  regExp: (actual: unknown, regExpLike: string | RegExp) =>
+    new RegExp(regExpLike).test(String(actual)),
 
   greater: (actual: unknown, expected: number) => Number(actual) > expected,
 
@@ -125,31 +128,31 @@ const comparators = {
     return actualLength <= expected;
   },
 
-  inRange: (actual: unknown, expected: [number, number]) => {
-    const [min, max] = expected;
+  inRange: (actual: unknown, range: [number, number]) => {
+    const [min, max] = range;
     return Number(actual) >= min && Number(actual) <= max;
   },
 
-  haveType: (actual: unknown, expected: HaveTypeTypes) => {
-    if (expected === 'array') return Array.isArray(actual);
-    if (expected === 'null') return actual === null;
+  haveType: (actual: unknown, type: HaveTypeType) => {
+    if (type === 'array') return Array.isArray(actual);
+    if (type === 'null') return actual === null;
     // eslint-disable-next-line valid-typeof
-    return typeof actual === expected;
+    return typeof actual === type;
   },
 
-  haveEntries: (actual: unknown, expected: any[] | PlainObject) => {
-    if (!isObjectLike(actual) || !isObjectLike(expected)) {
+  haveEntries: (actual: unknown, entry: any[] | PlainObject) => {
+    if (!isObjectLike(actual) || !isObjectLike(entry)) {
       return false;
     }
 
-    const actualFlatten = normalize(actual);
-    const expectedFlatten = normalize(expected);
+    const flattenActual = normalize(actual);
+    const flattenEntry = normalize(entry);
 
-    return Object.entries(expectedFlatten).every(([expectedFlattenKey, expectedValue]) => {
+    return Object.entries(flattenEntry).every(([flattenEntryKey, expectedValue]) => {
       if (isComparator(expectedValue)) {
-        return comparators.fn(actualFlatten[expectedFlattenKey], expectedValue);
+        return comparators.fn(flattenActual[flattenEntryKey], expectedValue);
       }
-      return comparators.equals(actualFlatten[expectedFlattenKey], expectedValue);
+      return comparators.equals(flattenActual[flattenEntryKey], expectedValue);
     });
   }
 };