feat: move filters to components

sgratzl · Apr 19, 2021 · d68041b · d68041b
1 parent f5ac38c
commit d68041b
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 48 deletions.
diff --git a/packages/components/src/filters/filterByCategoricalFilter.ts b/packages/components/src/filters/filterByCategoricalFilter.ts
@@ -0,0 +1,26 @@
+/**
+ * @lineup-lite/components
+ * https://github.com/sgratzl/lineup-lite
+ *
+ * Copyright (c) 2021 Samuel Gratzl <[email protected]>
+ */
+
+import { ALWAYS_TRUE } from './utils';
+
+/**
+ * filter function by a set of filter values
+ */
+export default function filterByCategoricalFilter(
+  filterValue?: readonly string[] | null
+): (value?: string | null) => boolean {
+  if (filterValue == null) {
+    return ALWAYS_TRUE;
+  }
+  const lookup = new Set(filterValue);
+  return (v) => {
+    if (v == null) {
+      return false;
+    }
+    return !lookup.has(v);
+  };
+}
diff --git a/packages/components/src/filters/filterByCategoricalSetFilter.ts b/packages/components/src/filters/filterByCategoricalSetFilter.ts
@@ -0,0 +1,49 @@
+/**
+ * @lineup-lite/components
+ * https://github.com/sgratzl/lineup-lite
+ *
+ * Copyright (c) 2021 Samuel Gratzl <[email protected]>
+ */
+
+import type { FilterSetValue } from '../components';
+import { ALWAYS_TRUE } from './utils';
+
+/**
+ * filter function by a set of filter values
+ */
+export default function filterByCategoricalSetFilter(
+  filterValue?: readonly FilterSetValue<string>[] | null
+): (value?: readonly string[] | ReadonlySet<string> | null) => boolean {
+  if (filterValue == null) {
+    return ALWAYS_TRUE;
+  }
+  const must: string[] = [];
+  const mustNot: string[] = [];
+  for (const v of filterValue) {
+    if (v.value) {
+      must.push(v.set);
+    } else {
+      mustNot.push(v.set);
+    }
+  }
+  return (v) => {
+    const hasV = v instanceof Set ? v : new Set(v);
+    if (mustNot.length > 0) {
+      // if any must not value is in the values -> false
+      for (const mi of mustNot) {
+        if (hasV.has(mi)) {
+          return false;
+        }
+      }
+    }
+    if (must.length > 0) {
+      // if any must value is not in the values -> false
+      for (const mi of must) {
+        if (!hasV.has(mi)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  };
+}
diff --git a/packages/components/src/filters/filterByRangeFilter.ts b/packages/components/src/filters/filterByRangeFilter.ts
@@ -0,0 +1,28 @@
+/**
+ * @lineup-lite/components
+ * https://github.com/sgratzl/lineup-lite
+ *
+ * Copyright (c) 2021 Samuel Gratzl <[email protected]>
+ */
+
+import { ALWAYS_TRUE } from './utils';
+
+/**
+ * a range numeric filter
+ */
+export default function filterByRangeFilter<T>(filterValue?: readonly [T, T] | null): (v?: T | null) => boolean {
+  if (filterValue == null) {
+    return ALWAYS_TRUE;
+  }
+  const matches = (v: T) =>
+    (filterValue[0] == null || v >= filterValue[0]) && (filterValue[1] == null || v <= filterValue[1]);
+  return (v) => {
+    if (v == null) {
+      return false;
+    }
+    if (Array.isArray(v)) {
+      return v.every((vi) => v != null && matches(vi));
+    }
+    return matches(v);
+  };
+}
diff --git a/packages/components/src/filters/index.ts b/packages/components/src/filters/index.ts
@@ -0,0 +1,11 @@
+/**
+ * @lineup-lite/components
+ * https://github.com/sgratzl/lineup-lite
+ *
+ * Copyright (c) 2021 Samuel Gratzl <[email protected]>
+ */
+
+export * from './utils';
+export { default as filterByCategoricalSetFilter } from './filterByCategoricalSetFilter';
+export { default as filterByRangeFilter } from './filterByRangeFilter';
+export { default as filterByCategoricalFilter } from './filterByCategoricalFilter';
diff --git a/packages/components/src/filters/utils.ts b/packages/components/src/filters/utils.ts
@@ -0,0 +1,8 @@
+/**
+ * @lineup-lite/components
+ * https://github.com/sgratzl/lineup-lite
+ *
+ * Copyright (c) 2021 Samuel Gratzl <[email protected]>
+ */
+
+export const ALWAYS_TRUE = () => true;
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
@@ -7,3 +7,5 @@
 
 export * from './components';
 export * from './math';
+export * from './filters';
+
diff --git a/packages/hooks/src/filters/categoricalFilter.ts b/packages/hooks/src/filters/categoricalFilter.ts
@@ -7,6 +7,7 @@
 
 import type { IdType, Row } from 'react-table';
 import type { AnyObject, UnknownObject } from '../interfaces';
+import { filterByCategoricalFilter, ALWAYS_TRUE } from '@lineup-lite/components';
 
 /**
  * filter function by a set of filter values
@@ -19,17 +20,14 @@ export function categoricalFilter<D extends AnyObject = UnknownObject>(
   ids: readonly IdType<D>[],
   filterValue: readonly string[]
 ): Row<D>[] {
-  if (filterValue == null) {
+  const f = filterByCategoricalFilter(filterValue);
+  if (f === ALWAYS_TRUE) {
     return rows as Row<D>[];
   }
-  const lookup = new Set(filterValue);
   return rows.filter((row) =>
     ids.some((id) => {
       const v = row.values[id];
-      if (v == null) {
-        return false;
-      }
-      return !lookup.has(v);
+      return f(v);
     })
   );
 }

diff --git a/packages/hooks/src/filters/categoricalSetFilter.ts b/packages/hooks/src/filters/categoricalSetFilter.ts
@@ -6,7 +6,7 @@
  */
 
 import type { IdType, Row } from 'react-table';
-import type { FilterSetValue } from '@lineup-lite/components';
+import { filterByCategoricalSetFilter, ALWAYS_TRUE, FilterSetValue } from '@lineup-lite/components';
 import type { AnyObject, UnknownObject } from '../interfaces';
 
 /**
@@ -20,42 +20,14 @@ export function categoricalSetFilter<D extends AnyObject = UnknownObject>(
   ids: readonly IdType<D>[],
   filterValue: readonly FilterSetValue<string>[]
 ): Row<D>[] {
-  if (filterValue == null) {
+  const f = filterByCategoricalSetFilter(filterValue);
+  if (f === ALWAYS_TRUE) {
     return rows as Row<D>[];
   }
-  const must: string[] = [];
-  const mustNot: string[] = [];
-  for (const v of filterValue) {
-    if (v.value) {
-      must.push(v.set);
-    } else {
-      mustNot.push(v.set);
-    }
-  }
   return rows.filter((row) =>
     ids.some((id) => {
       const v = row.values[id] as readonly string[] | Set<string>;
-      if (v == null) {
-        return false;
-      }
-      const hasV = v instanceof Set ? v : new Set(v);
-      if (mustNot.length > 0) {
-        // if any must not value is in the values -> false
-        for (const mi of mustNot) {
-          if (hasV.has(mi)) {
-            return false;
-          }
-        }
-      }
-      if (must.length > 0) {
-        // if any must value is not in the values -> false
-        for (const mi of must) {
-          if (!hasV.has(mi)) {
-            return false;
-          }
-        }
-      }
-      return true;
+      return f(v);
     })
   );
 }

diff --git a/packages/hooks/src/filters/rangeFilter.ts b/packages/hooks/src/filters/rangeFilter.ts
@@ -6,6 +6,7 @@
  */
 
 import type { Row } from 'react-table';
+import { filterByRangeFilter, ALWAYS_TRUE } from '@lineup-lite/components';
 import type { AnyObject, UnknownObject } from '../interfaces';
 
 /**
@@ -16,21 +17,14 @@ export function rangeFilter<D extends AnyObject = UnknownObject, T = unknown>(
   ids: readonly string[],
   filterValue: readonly [T, T]
 ): Row<D>[] {
-  if (filterValue == null) {
+  const f = filterByRangeFilter(filterValue);
+  if (f === ALWAYS_TRUE) {
     return rows as Row<D>[];
   }
-  const matches = (v: T) =>
-    (filterValue[0] == null || v >= filterValue[0]) && (filterValue[1] == null || v <= filterValue[1]);
   return rows.filter((row) =>
     ids.some((id) => {
       const v = row.values[id];
-      if (v == null) {
-        return false;
-      }
-      if (Array.isArray(v)) {
-        return v.every((vi) => v != null && matches(vi));
-      }
-      return matches(v);
+      return f(v);
     })
   );
 }