feat: support boolean search (#110)

* feat: support boolean search * fix: boolean search problem in caseSensitive mode * chore: add changeset * revert: return false when type is different in caseSensitive mode
thundermiracle · Aug 14, 2023 · 719e5ad · 719e5ad
1 parent 0d01fbb
commit 719e5ad
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 7 deletions.
diff --git a/.changeset/yellow-hornets-act.md b/.changeset/yellow-hornets-act.md
@@ -0,0 +1,5 @@
+---
+"filter-data": minor
+---
+
+feat: support boolean search
diff --git a/__test__/filters/equal.test.ts b/__test__/filters/equal.test.ts
@@ -17,6 +17,14 @@ const searchDataArray = {
   fullName: ['Ben', 'Jackson'],
 };
 
+const searchDataBoolean = {
+  married: true,
+};
+
+const searchDataArrayBoolean = {
+  married: [true, true],
+};
+
 describe('test caseSensitive flag', () => {
   test('return false if key is incorrect', () => {
     const result = equal(
@@ -146,7 +154,7 @@ describe('test searchCondition', () => {
     expect(result).toBe(true);
   });
 
-  test('targetvalue is array, different alphabet case -> true', () => {
+  test('target value is array, different alphabet case -> true', () => {
     const result = equal(
       {
         key: 'fullName',
@@ -229,4 +237,60 @@ describe('test searchCondition', () => {
 
     expect(result).toBe(true);
   });
+
+  test('target value is boolean string and search value is boolean -> true', () => {
+    const result = equal(
+      {
+        key: 'married',
+        value: true,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataBoolean,
+    );
+
+    expect(result).toBe(true);
+  });
+
+  test('target value is array of boolean string and search value is boolean -> true', () => {
+    const result = equal(
+      {
+        key: 'married',
+        value: true,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataArrayBoolean,
+    );
+
+    expect(result).toBe(true);
+  });
+
+  test('target value is boolean string and search value is boolean -> false', () => {
+    const result = equal(
+      {
+        key: 'married',
+        value: false,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataBoolean,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  test('target value is array of boolean string and search value is boolean -> false', () => {
+    const result = equal(
+      {
+        key: 'married',
+        value: false,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataArrayBoolean,
+    );
+
+    expect(result).toBe(false);
+  });
 });
diff --git a/__test__/filters/notEqual.test.ts b/__test__/filters/notEqual.test.ts
@@ -17,6 +17,14 @@ const searchDataArray = {
   fullName: ['Ben', 'Jackson'],
 };
 
+const searchDataBoolean = {
+  married: true,
+};
+
+const searchDataArrayBoolean = {
+  married: [true, true],
+};
+
 describe('test caseSensitive flag', () => {
   test('caseSensitive=true(same string, different alphabet case) -> true', () => {
     const result = notEqual(
@@ -187,4 +195,60 @@ describe('test searchCondition', () => {
 
     expect(result).toBe(false);
   });
+
+  test('target value is boolean string and search value is boolean -> true', () => {
+    const result = notEqual(
+      {
+        key: 'married',
+        value: true,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataBoolean,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  test('target value is array of boolean string and search value is boolean -> true', () => {
+    const result = notEqual(
+      {
+        key: 'married',
+        value: true,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataArrayBoolean,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  test('target value is boolean string and search value is boolean -> false', () => {
+    const result = notEqual(
+      {
+        key: 'married',
+        value: false,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataBoolean,
+    );
+
+    expect(result).toBe(true);
+  });
+
+  test('target value is array of boolean string and search value is boolean -> false', () => {
+    const result = notEqual(
+      {
+        key: 'married',
+        value: false,
+        type: SearchType.EQ,
+      },
+      false,
+      searchDataArrayBoolean,
+    );
+
+    expect(result).toBe(true);
+  });
 });
diff --git a/src/filters/equal.ts b/src/filters/equal.ts
@@ -21,19 +21,19 @@ const equal: FilterFunction = ({ key, value }, caseSensitive, data) => {
 
   if (Array.isArray(targetValue)) {
     if (caseSensitive) {
-      return targetValue.includes(value);
+      return targetValue.includes(value.toString());
     }
 
     return targetValue
-      .map((x: string | number) => x.toString().toUpperCase())
+      .map((x) => x.toString().toUpperCase())
       .includes(value.toString().toUpperCase());
   }
 
   if (caseSensitive) {
     return targetValue === value.toString();
   }
 
-  return targetValue.toUpperCase() === value.toString().toUpperCase();
+  return targetValue.toString().toUpperCase() === value.toString().toUpperCase();
 };
 
 export default equal;
diff --git a/src/filters/greater.ts b/src/filters/greater.ts
@@ -29,7 +29,7 @@ const greater: FilterFunction = ({ key, value }, caseSensitive, data) => {
     return targetValue > value;
   }
 
-  return targetValue.toUpperCase() > value.toString().toUpperCase();
+  return targetValue.toString().toUpperCase() > value.toString().toUpperCase();
 };
 
 export default greater;
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -9,7 +9,7 @@ export interface FilterDataOption {
 
 export interface SearchCondition {
   key: string | string[];
-  value: string | number;
+  value: string | number | boolean;
   type: SearchType;
 }
 
@@ -19,7 +19,7 @@ export interface SearchConditionMultiple {
   type: SearchType;
 }
 
-export type DataObjectValues = string | number | (string | number)[];
+export type DataObjectValues = string | number | boolean | (string | number | boolean)[];
 export interface DataObject {
   [key: string]: DataObjectValues | DataObject;
 }