refactor: extract item filtering functions to separate module

Author: ilyvion

src/components/FilteredNavigationData/FilteredNavigationData.tsx

@@ -8,7 +8,12 @@ import { ComicId } from '@models/ComicId'
 import { HydratedItemNavigationData } from '@models/HydratedItemData'
 import { ItemBody } from '@models/ItemBody'
 import { ItemId } from '@models/ItemId'
-import { ItemType } from '@models/ItemType'
+
+import {
+    filterItems,
+    getFilterWithoutType,
+    getTypeFromFilter,
+} from '~/itemFilters'
 
 export default function FilteredNavigationData({
     isLoading,
@@ -122,48 +127,3 @@ export default function FilteredNavigationData({
         </>
     )
 }
-
-function filterItems(
-    allNavigationItems: HydratedItemNavigationData[],
-    filter: string
-) {
-    const type = getTypeFromFilter(filter)
-
-    let filteredByType
-    if (type !== 'item') {
-        filteredByType = allNavigationItems.filter((i) => i.type === type)
-    } else {
-        filteredByType = allNavigationItems
-    }
-
-    filter = getFilterWithoutType(filter)
-    return filteredByType.filter(
-        (i) =>
-            i.shortName.toUpperCase().indexOf(filter.toUpperCase()) !== -1 ||
-            i.name.toUpperCase().indexOf(filter.toUpperCase()) !== -1
-    )
-}
-
-function getTypeFromFilter(filter: string) {
-    const typeFilter = filter.charAt(0)
-    let type: ItemType | 'item' = 'item'
-    switch (typeFilter) {
-        case '!':
-            type = 'cast'
-            break
-        case '@':
-            type = 'location'
-            break
-        case '#':
-            type = 'storyline'
-            break
-    }
-    return type
-}
-
-function getFilterWithoutType(filter: string) {
-    if (getTypeFromFilter(filter) !== 'item') {
-        filter = filter.substring(1)
-    }
-    return filter
-}

src/itemFilters.ts

@@ -0,0 +1,53 @@
+import { ItemType } from '@models/ItemType'
+
+export type FilterItemType = ItemType | 'item'
+
+export function getTypeFromFilter(filter: string) {
+    const typeFilter = filter.charAt(0)
+    let type: FilterItemType = 'item'
+    switch (typeFilter) {
+        case '!':
+            type = 'cast'
+            break
+        case '@':
+            type = 'location'
+            break
+        case '#':
+            type = 'storyline'
+            break
+    }
+    return type
+}
+
+export function getFilterWithoutType(filter: string) {
+    if (getTypeFromFilter(filter) !== 'item') {
+        filter = filter.substring(1)
+    }
+    return filter
+}
+
+type FilterableItem = {
+    shortName: string
+    name: string
+    type: ItemType
+}
+export function filterItems<I extends FilterableItem>(
+    items: I[],
+    filter: string
+) {
+    const type = getTypeFromFilter(filter)
+
+    let filteredByType
+    if (type !== 'item') {
+        filteredByType = items.filter((i) => i.type === type)
+    } else {
+        filteredByType = items
+    }
+
+    filter = getFilterWithoutType(filter)
+    return filteredByType.filter(
+        (i) =>
+            i.shortName.toUpperCase().indexOf(filter.toUpperCase()) !== -1 ||
+            i.name.toUpperCase().indexOf(filter.toUpperCase()) !== -1
+    )
+}

src/utils.ts

@@ -238,8 +238,8 @@ export function range(start: number, end: number) {
     return Array.from({ length }, (_, i) => start + i)
 }
 
-export function dbg<T>(d: string, v: T) {
-    console.log(d, v)
+export function dbg<T>(v: T, d?: string) {
+    console.log(v, d)
     return v
 }