fix: more client ts checks

WatWowMap · Feb 8, 2024 · 5028cb2 · 5028cb2
1 parent 494639a
commit 5028cb2
Show file tree

Hide file tree

Showing 20 changed files with 156 additions and 78 deletions.
diff --git a/src/assets/mui/global.jsx b/src/assets/mui/global.jsx
@@ -1,3 +1,4 @@
+// @ts-check
 import * as React from 'react'
 import GlobalStyles from '@mui/material/GlobalStyles'
 import { darken, lighten } from '@mui/material/styles'

diff --git a/src/components/ClearStorage.jsx b/src/components/ClearStorage.jsx
@@ -6,20 +6,22 @@ import { useMemory } from '@hooks/useMemory'
 import { useStorage } from '@hooks/useStorage'
 
 export default function ClearStorage() {
-  localStorage.clear()
-  sessionStorage.clear()
-
   React.useEffect(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+
+    const { filters, menus } = useMemory.getState()
     useStorage.setState({
-      filters: {},
-      menus: {},
+      filters: structuredClone(filters),
+      menus: structuredClone(menus),
       location: [
         CONFIG.map.general.startLat || 0,
         CONFIG.map.general.startLon || 0,
       ],
       zoom: CONFIG.map.general.startZoom,
     })
-    useMemory.setState({ Icons: null })
+    useMemory.setState({ Icons: null, Audio: null })
   }, [])
+
   return <Navigate to="/" />
 }
diff --git a/src/components/layout/dialogs/filters/FilterMenu.jsx b/src/components/layout/dialogs/filters/FilterMenu.jsx
@@ -30,6 +30,7 @@ export default function FilterMenu() {
     setTempFilters(filters?.filter)
   }, [category, filters?.filter])
 
+  if (!category || !type) return null
   return (
     <DialogWrapper
       open={open && type === 'filters' && !!tempFilters}

diff --git a/src/components/layout/general/Menu.jsx b/src/components/layout/general/Menu.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import * as React from 'react'
 import Box from '@mui/material/Box'
 import DialogContent from '@mui/material/DialogContent'
 import Typography from '@mui/material/Typography'
@@ -22,11 +22,12 @@ import { GenericSearch } from '../drawer/ItemSearch'
 import { applyToAllWebhooks, useWebhookStore } from '../dialogs/webhooks/store'
 
 /**
+ * @template {import('@rm/types').AdvCategories} T
  * @param {{
- *  category: string
+ *  category: T
  *  webhookCategory?: string
- *  tempFilters: import('@rm/types').Filters
- *  children: (item: import('@rm/types').MenuItem, key: string) => React.ReactNode
+ *  tempFilters: import('@rm/types').AllFilters[T]
+ *  children: (index: number, key: string) => React.ReactNode
  *  categories?: import('@rm/types').Available[]
  *  title: string
  *  titleAction: () => void
@@ -51,7 +52,7 @@ export default function Menu({
   const { t } = useTranslation()
   const menus = useStorage((state) => state.menus)
 
-  const [filterDrawer, setFilterDrawer] = useState(false)
+  const [filterDrawer, setFilterDrawer] = React.useState(false)
 
   const { filteredArr, count } = useFilter(
     tempFilters,
@@ -74,55 +75,57 @@ export default function Menu({
   )
 
   const footerButtons = React.useMemo(
-    () => [
-      {
-        name: 'help',
-        action: () =>
-          useLayoutStore.setState({ help: { open: true, category } }),
-        icon: 'HelpOutline',
-      },
-      {
-        name: '',
-        disabled: true,
-      },
-      {
-        name: 'apply_to_all',
-        action: () =>
-          (webhookCategory ? useWebhookStore : useLayoutStore).setState({
-            [webhookCategory ? 'advanced' : 'advancedFilter']: {
-              open: true,
-              id: 'global',
-              category: webhookCategory || category,
-              selectedIds: filteredArr,
-            },
-          }),
-        icon: category === 'pokemon' || webhookCategory ? 'Tune' : 'FormatSize',
-      },
-      {
-        name: 'disable_all',
-        action: () =>
-          webhookCategory
-            ? applyToAllWebhooks(false, filteredArr)
-            : applyToAll({ enabled: false }, category, filteredArr),
-        icon: 'Clear',
-        color: 'error',
-      },
-      {
-        name: 'enable_all',
-        action: () =>
-          webhookCategory
-            ? applyToAllWebhooks(true, filteredArr)
-            : applyToAll(
-                { enabled: true },
-                category,
-                filteredArr,
-                !webhookCategory,
-              ),
-        icon: 'Check',
-        color: 'success',
-      },
-      ...(extraButtons ?? []),
-    ],
+    () =>
+      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
+        {
+          name: 'help',
+          action: () =>
+            useLayoutStore.setState({ help: { open: true, category } }),
+          icon: 'HelpOutline',
+        },
+        {
+          name: '',
+          disabled: true,
+        },
+        {
+          name: 'apply_to_all',
+          action: () =>
+            (webhookCategory ? useWebhookStore : useLayoutStore).setState({
+              [webhookCategory ? 'advanced' : 'advancedFilter']: {
+                open: true,
+                id: 'global',
+                category: webhookCategory || category,
+                selectedIds: filteredArr,
+              },
+            }),
+          icon:
+            category === 'pokemon' || webhookCategory ? 'Tune' : 'FormatSize',
+        },
+        {
+          name: 'disable_all',
+          action: () =>
+            webhookCategory
+              ? applyToAllWebhooks(false, filteredArr)
+              : applyToAll({ enabled: false }, category, filteredArr),
+          icon: 'Clear',
+          color: 'error',
+        },
+        {
+          name: 'enable_all',
+          action: () =>
+            webhookCategory
+              ? applyToAllWebhooks(true, filteredArr)
+              : applyToAll(
+                  { enabled: true },
+                  category,
+                  filteredArr,
+                  !webhookCategory,
+                ),
+          icon: 'Check',
+          color: 'success',
+        },
+        ...(extraButtons ?? []),
+      ]),
     [category, webhookCategory, extraButtons, filteredArr, tempFilters],
   )
 

diff --git a/src/hooks/useLayoutStore.js b/src/hooks/useLayoutStore.js
@@ -25,7 +25,7 @@ import { useStorage } from './useStorage'
  *  },
  *  dialog: {
  *    open: boolean,
- *    category: string,
+ *    category: import('@rm/types').AdvCategories | '',
  *    type: string,
  *  },
  *  gymBadge: {

diff --git a/src/hooks/useLocation.js b/src/hooks/useLocation.js
@@ -10,7 +10,9 @@ import 'leaflet.locatecontrol'
  */
 export default function useLocation() {
   const map = useMap()
-  const [color, setColor] = useState('inherit')
+  const [color, setColor] = useState(
+    /** @type {import('@mui/material').ButtonProps['color']} */ ('inherit'),
+  )
   const { t } = useTranslation()
 
   const lc = useMemo(() => {

diff --git a/src/services/filtering/genPokemon.js b/src/services/filtering/genPokemon.js
@@ -1,6 +1,11 @@
 import { t } from 'i18next'
 
-/* eslint-disable no-nested-ternary */
+/**
+ *
+ * @param {import('@rm/masterfile').Masterfile} pokemon
+ * @param {string[]} categories
+ * @returns
+ */
 export default function genPokemon(pokemon, categories) {
   const tempObj = Object.fromEntries(
     categories.map((x) => [
@@ -25,7 +30,10 @@ export default function genPokemon(pokemon, categories) {
         (x) => `poke_type_${x}`,
       )
       const name =
-        form.name && form.name !== 'Normal' && j != 0 && j != pkmn.defaultFormId
+        form.name &&
+        form.name !== 'Normal' &&
+        j !== '0' &&
+        j != pkmn.defaultFormId
           ? formName
           : pokeName
       tempObj.pokemon[id] = {

diff --git a/src/services/filtering/genPokestops.js b/src/services/filtering/genPokestops.js
@@ -1,5 +1,12 @@
 import { t } from 'i18next'
 
+/**
+ *
+ * @param {import('@rm/masterfile').Masterfile} pokemon
+ * @param {*} pokestops
+ * @param {*} categories
+ * @returns
+ */
 export default function genPokestops(pokemon, pokestops, categories) {
   const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
   if (!pokestops?.filter) return {}
@@ -149,9 +156,8 @@ export default function genPokestops(pokemon, pokestops, categories) {
               tempObj.quest_reward_9 &&
               pokemon[monId]
             ) {
-              const category = [
-                id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9',
-              ]
+              const category =
+                id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9'
               tempObj[category][id] = {
                 name: `${t(`poke_${monId}`)} ${
                   id.charAt(0) === 'c' ? t('candy') : t('xl')

diff --git a/src/services/functions/checkAdvFilter.js b/src/services/functions/checkAdvFilter.js
@@ -1,7 +1,13 @@
+// @ts-check
 /* eslint-disable no-plusplus */
 /* eslint-disable no-cond-assign */
 /* eslint-disable default-case */
-export default function checkIVFilterValid(filter, dnf = true) {
+
+/**
+ * @param {string} filter
+ * @param {boolean} [dnf]
+ */
+function checkIVFilterValid(filter, dnf = true) {
   const input = filter.toUpperCase()
   const tokenizer =
     /\s*([()|&!,]|([ADSLXG]?|CP|LC|[GU]L)\s*([0-9]+(?:\.[0-9]*)?)(?:\s*-\s*([0-9]+(?:\.[0-9]*)?))?)/g
@@ -58,3 +64,5 @@ export default function checkIVFilterValid(filter, dnf = true) {
   }
   return true
 }
+
+export default checkIVFilterValid
diff --git a/src/services/functions/dayCheck.js b/src/services/functions/dayCheck.js
@@ -1,7 +1,15 @@
-export default function dayCheck(currentStamp, desiredStamp) {
+// @ts-check
+
+/**
+ * @param {number} currentStamp
+ * @param {number} desiredStamp
+ */
+function dayCheck(currentStamp, desiredStamp) {
   const locale = localStorage.getItem('i18nextLng') || 'en'
   if (currentStamp - desiredStamp < 86400) {
     return new Date(desiredStamp * 1000).toLocaleTimeString(locale)
   }
   return new Date(desiredStamp * 1000).toLocaleString(locale)
 }
+
+export default dayCheck
diff --git a/src/services/functions/deepMerge.js b/src/services/functions/deepMerge.js
@@ -1,9 +1,16 @@
+// @ts-check
+
+/** @param {any} item */
 function isObject(item) {
   return (
     item && typeof item === 'object' && !Array.isArray(item) && item !== null
   )
 }
 
+/**
+ * @param {Record<string, any>} target
+ * @param {...Record<string, any>} sources
+ */
 export function deepMerge(target, ...sources) {
   if (!sources.length) return target
   const source = sources.shift()

diff --git a/src/services/functions/formatInterval.js b/src/services/functions/formatInterval.js
@@ -1,4 +1,7 @@
-export default function formatInterval(intervalMs) {
+// @ts-check
+
+/** @param {number} intervalMs */
+function formatInterval(intervalMs) {
   const diff = Math.floor(intervalMs / 1000)
   const d = Math.floor(diff / 86400)
   const h = Math.floor(diff / 3600)
@@ -16,3 +19,5 @@ export default function formatInterval(intervalMs) {
 
   return { str: str.join(' '), diff }
 }
+
+export default formatInterval
diff --git a/src/services/functions/fromSearchCategory.js b/src/services/functions/fromSearchCategory.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  *
  * @param {string} searchCategory

diff --git a/src/services/functions/fromSnakeCase.js b/src/services/functions/fromSnakeCase.js
@@ -1,6 +1,10 @@
-/* eslint-disable import/prefer-default-export */
+// @ts-check
 import { capitalize } from '@mui/material'
 
+/**
+ * @param {string} str
+ * @param {string} [separator]
+ */
 export function fromSnakeCase(str, separator = ' ') {
   return capitalize(str)
     .replace(/_/g, separator)

diff --git a/src/services/functions/getBadge.js b/src/services/functions/getBadge.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * Get rank badge, commonly used for pvp and contests
  * @param {number} rank

diff --git a/src/services/functions/getProperName.js b/src/services/functions/getProperName.js
@@ -1,4 +1,10 @@
-export default function getProperName(word) {
+// @ts-check
+/**
+ * @param {string} word
+ */
+function getProperName(word) {
   const capital = `${word.charAt(0).toUpperCase()}${word.slice(1)}`
   return capital.replace(/([a-z0-9])([A-Z])/g, '$1 $2')
 }
+
+export default getProperName
diff --git a/src/services/functions/isLocalStorageEnabled.js b/src/services/functions/isLocalStorageEnabled.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 export function isLocalStorageEnabled() {
   const test = 'test'
 

diff --git a/src/services/functions/offset.js b/src/services/functions/offset.js
@@ -1,3 +1,4 @@
+// @ts-check
 /* eslint-disable no-bitwise */
 
 /**
@@ -33,9 +34,11 @@ export const cyrb53 = (str, seed = 0) => {
  */
 export const getOffset = (coords, amount, id, seed = 0) => {
   const rand = cyrb53(id, seed)
-  return [0, 1].map((i) => {
-    let offset = rand[i] * (0.0002 / 4294967296) - 0.0001
-    offset += offset >= 0 ? -amount : amount
-    return coords[i] + offset
-  })
+  return /** @type {[number, number]} */ (
+    [0, 1].map((i) => {
+      let offset = rand[i] * (0.0002 / 4294967296) - 0.0001
+      offset += offset >= 0 ? -amount : amount
+      return coords[i] + offset
+    })
+  )
 }
diff --git a/src/services/functions/parseConditions.js b/src/services/functions/parseConditions.js
@@ -1,4 +1,7 @@
-export default function parseQuestConditions(conditions) {
+// @ts-check
+
+/** @param {string} conditions */
+function parseQuestConditions(conditions) {
   const [type1, type2] = JSON.parse(conditions)
   const conditionsToReturn = []
   const parseMadRewards = (specifics) => {
@@ -60,3 +63,5 @@ export default function parseQuestConditions(conditions) {
   }
   return conditionsToReturn
 }
+
+export default parseQuestConditions