poi-plugin-quest-info-2 0.10.3 → 0.10.5

package/src/__tests__/__snapshots__/questHelper.spec.ts.snap

@@ -1,9 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`questHelper should 101 locked quests match snapshot 1`] = `
-Object {
+{
   "1001": true,
-  "1002": true,
   "102": true,
   "103": true,
   "104": true,
@@ -19,19 +18,26 @@ Object {
   "1104": true,
   "1105": true,
   "1106": true,
+  "1108": true,
   "1109": true,
   "111": true,
+  "1110": true,
   "1111": true,
   "1113": true,
   "1116": true,
   "1117": true,
   "1118": true,
   "112": true,
+  "1120": true,
   "1127": true,
   "1128": true,
   "1129": true,
   "113": true,
   "1130": true,
+  "1131": true,
+  "1132": true,
+  "1133": true,
+  "1134": true,
   "114": true,
   "115": true,
   "116": true,
@@ -414,6 +420,7 @@ Object {
   "947": true,
   "948": true,
   "949": true,
+  "958": true,
   "961": true,
   "966": true,
   "967": true,
@@ -431,6 +438,7 @@ Object {
   "982": true,
   "983": true,
   "989": true,
+  "992": true,
   "993": true,
   "994": true,
   "995": true,
@@ -440,7 +448,7 @@ Object {
 `;
 
 exports[`questHelper should 196 getLockedQuest correct 1`] = `
-Object {
+{
   "197": true,
   "346": true,
   "892": true,
@@ -449,7 +457,7 @@ Object {
 `;
 
 exports[`questHelper should 236 getCompletedQuest correct 1`] = `
-Object {
+{
   "101": true,
   "102": true,
   "103": true,
@@ -478,7 +486,7 @@ Object {
 `;
 
 exports[`questHelper should getCompletedQuest quest match snapshot 1`] = `
-Object {
+{
   "101": true,
   "102": true,
   "103": true,

package/src/__tests__/kcanotifyData.spec.ts

@@ -1,19 +1,19 @@
 import { version, QuestData } from '../../build/kcanotifyGamedata'
 
 test('should Kcanotify Game data version correct', () => {
-  expect(version).toMatchInlineSnapshot(`"2023082801"`)
+  expect(version).toMatchInlineSnapshot(`"2023102201"`)
 })
 
 test('should Kcanotify Game data keys correct', () => {
   expect(Object.keys(QuestData)).toMatchInlineSnapshot(`
-Array [
-  "zh-CN",
-  "zh-TW",
-  "ja-JP",
-  "en-US",
-  "ko-KR",
-]
-`)
+   [
+     "zh-CN",
+     "zh-TW",
+     "ja-JP",
+     "en-US",
+     "ko-KR",
+   ]
+  `)
 })
 
 describe('should format correct', () => {

package/src/__tests__/kcwikiData.spec.ts

@@ -4,16 +4,16 @@ import newQuestData from '../../build/kcQuestsData/quests-scn-new.json'
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
     expect(version).toMatchInlineSnapshot(
-      `"6e87c9c0c3d9cf9694950eef49efd82ed0bc8752"`
+      `"793e277cd7bff779f322e8b8a5b99fee0c631e93"`,
     )
   })
 
   test('should KcwikiQuestData Game data keys correct', () => {
     expect(Object.keys(KcwikiQuestData)).toMatchInlineSnapshot(`
-          Array [
-            "zh-CN",
-          ]
-      `)
+     [
+       "zh-CN",
+     ]
+    `)
   })
 })
 

package/src/__tests__/questCategory.spec.ts

@@ -7,9 +7,9 @@ describe('should questCategory correct', () => {
     expect(questCategory.dailyQuest.length).toMatchInlineSnapshot(`23`)
     expect(questCategory.weeklyQuest.length).toMatchInlineSnapshot(`17`)
     expect(questCategory.monthlyQuest.length).toMatchInlineSnapshot(`11`)
-    expect(questCategory.quarterlyQuest.length).toMatchInlineSnapshot(`25`)
+    expect(questCategory.quarterlyQuest.length).toMatchInlineSnapshot(`27`)
     expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`45`)
-    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`470`)
+    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`468`)
   })
 
   test('snapshot', () => {
@@ -27,7 +27,7 @@ describe('should questCategory correct', () => {
             code: mergeData[String(gameId) as keyof typeof mergeData].code,
             name: mergeData[String(gameId) as keyof typeof mergeData].name,
           })),
-      ])
+      ]),
     )
 
     expect(humanReadableData).toMatchSnapshot({

package/src/components/QuestCard/index.tsx

@@ -1,5 +1,6 @@
 import { Card, Elevation, H5 } from '@blueprintjs/core'
 import React, { forwardRef } from 'react'
+// https://github.com/bvaughn/react-highlight-words
 import Highlighter from 'react-highlight-words'
 import type { StyledComponentProps } from 'styled-components'
 import { usePluginTranslation } from '../../poi/hooks'
@@ -86,7 +87,7 @@ export const QuestCard = forwardRef<
         <H5>
           <Highlighter
             searchWords={searchWords}
-            autoEscape={false}
+            autoEscape={true}
             textToHighlight={[code, name]
               .filter((i) => i != undefined)
               .join(' - ')}
@@ -94,14 +95,14 @@ export const QuestCard = forwardRef<
         </H5>
         <Highlighter
           searchWords={searchWords}
-          autoEscape={false}
+          autoEscape={true}
           textToHighlight={desc}
         />
         {tip2 && (
           <b>
             <Highlighter
               searchWords={searchWords}
-              autoEscape={false}
+              autoEscape={true}
               textToHighlight={tip2}
             />
           </b>
@@ -110,7 +111,7 @@ export const QuestCard = forwardRef<
           <i>
             <Highlighter
               searchWords={searchWords}
-              autoEscape={false}
+              autoEscape={true}
               textToHighlight={tip}
             />
           </i>

package/src/patch.ts

@@ -46,7 +46,7 @@ const getQuestState = (maybeLanguage: string) => {
         wiki_id: data.code,
         condition: [(data as any).memo2, data.desc].filter(Boolean).join(' | '),
       },
-    ])
+    ]),
   )
 }
 
@@ -72,7 +72,7 @@ export const patchLegacyQuestPluginReducer = async () => {
 
     const reducer = (
       state = initState,
-      action: { type: string; [x: string]: any }
+      action: { type: string; [x: string]: any },
     ) => {
       switch (action.type) {
         case '@@Config':

package/src/poi/hooks.ts

@@ -60,7 +60,7 @@ const useActiveTab = () => {
     // poooi/poi/views/redux/ui.es
     return observePoiStore(
       listener,
-      (state) => state?.ui?.activeMainTab ?? UNKNOWN_TAB
+      (state) => state?.ui?.activeMainTab ?? UNKNOWN_TAB,
     )
   }, [])
 
@@ -88,7 +88,7 @@ export const useStateExporter = () => {
       throw new Error('Failed to export quest data! questList not found!')
     }
     return navigator.clipboard.writeText(
-      JSON.stringify(state?.ext[PACKAGE_NAME]._.questList)
+      JSON.stringify(state?.ext[PACKAGE_NAME]._.questList),
     )
   }
   const importAsPoiState = (stateString: string) => {

package/src/poi/store.ts

@@ -9,7 +9,7 @@ import type { PoiState, Store } from './types'
 const observeStore = <State, SelectedState = State>(
   store: Store<State>,
   onChange: (state: SelectedState) => void,
-  selector: (s: State) => SelectedState = id as any
+  selector: (s: State) => SelectedState = id as any,
 ) => {
   let currentState: SelectedState
 
@@ -28,7 +28,7 @@ const observeStore = <State, SelectedState = State>(
 
 export const observePoiStore = <SelectedState = PoiState>(
   onChange: (state: SelectedState) => void,
-  selector: (state: PoiState) => SelectedState = id as any
+  selector: (state: PoiState) => SelectedState = id as any,
 ) => {
   let valid = true
   let unsubscribe = noop
@@ -47,14 +47,14 @@ export const observePoiStore = <SelectedState = PoiState>(
 
 export const observePluginStore = <SelectedState = PluginState>(
   onChange: (state: SelectedState) => void,
-  selector: (state: PluginState) => SelectedState = id as any
+  selector: (state: PluginState) => SelectedState = id as any,
 ) => observePoiStore(onChange, (s) => selector(s?.ext[PACKAGE_NAME]))
 
 const genFallbackStore = (state?: PoiState) =>
   ({
     getState: () => state,
     subscribe: () => (() => {}) as () => () => void,
-  } as Store<PoiState>)
+  }) as Store<PoiState>
 
 let globalStore: Store<PoiState> | null = null
 /**
@@ -80,7 +80,7 @@ export const getPoiStore: () => Promise<Store<PoiState>> = async () => {
 export const exportPoiState = async () => {
   if (!IN_POI) {
     throw new Error(
-      'Failed export state from poi! You are not currently in the poi environment!'
+      'Failed export state from poi! You are not currently in the poi environment!',
     )
   }
   const { getState } = await getPoiStore()

package/src/poi/types.ts

@@ -54,7 +54,7 @@ export type GameQuest = {
       api_kind: number
       api_mst_id: number
       api_no: number
-    }[]
+    }[],
   ]
   api_voice_id: 0
   api_bonus_flag: 1

package/src/questHelper.ts

@@ -158,8 +158,8 @@ export const getCategory = (api_category: number) => {
  * See https://wikiwiki.jp/kancolle/
  */
 export const guessQuestCategory = (
-  wikiId: string
-): typeof CategoryMap[keyof typeof CategoryMap] => {
+  wikiId: string,
+): (typeof CategoryMap)[keyof typeof CategoryMap] => {
   if (!wikiId || !wikiId.length) {
     return CategoryMap[QUEST_CATEGORY.Unknown]
   }
@@ -230,7 +230,7 @@ export const getPostQuestIds = (gameId: number): number[] =>
 
 const calcQuestMap = (
   inProgressQuests: number[],
-  next: (gameId: number) => number[]
+  next: (gameId: number) => number[],
 ) => {
   const map: Record<number, true> = {}
   const queue: number[] = inProgressQuests.flatMap(next)
@@ -260,7 +260,7 @@ export const getCompletedQuest = moize(
       }
       return cacheKeyArg === keyArg
     },
-  }
+  },
 )
 
 export const getLockedQuest = moize(
@@ -275,11 +275,11 @@ export const getLockedQuest = moize(
       }
       return cacheKeyArg === keyArg
     },
-  }
+  },
 )
 
 export const questApiStateToQuestStatus = (
-  state: QUEST_API_STATE | undefined
+  state: QUEST_API_STATE | undefined,
 ): QUEST_STATUS => {
   switch (state) {
     case QUEST_API_STATE.DEFAULT:

package/src/reducer.ts

@@ -9,7 +9,7 @@ export type PluginState = { _: typeof initState }
 
 export const reducer = (
   state = initState,
-  action: PoiAction
+  action: PoiAction,
 ): typeof initState => {
   switch (action.type) {
     case '@@Response/kcsapi/api_get_member/questlist': {

package/src/store/filterTags.ts

@@ -11,10 +11,10 @@ export const useFilterTags = () => {
     updateStore,
   } = useStore()
   const setCategoryTags = useCallback(
-    (tagName: typeof CATEGORY_TAGS[number]['name']) => {
+    (tagName: (typeof CATEGORY_TAGS)[number]['name']) => {
       updateStore({ categoryTags: { [tagName]: true } })
     },
-    [updateStore]
+    [updateStore],
   )
 
   const setCategoryTagsAll = useCallback(() => {
@@ -22,16 +22,16 @@ export const useFilterTags = () => {
   }, [setCategoryTags])
 
   const setTypeTags = useCallback(
-    (tagName: typeof TYPE_TAGS[number]['name']) => {
+    (tagName: (typeof TYPE_TAGS)[number]['name']) => {
       updateStore({ typeTags: { [tagName]: true } })
     },
-    [updateStore]
+    [updateStore],
   )
   const setMultiTypeTags = useCallback(
     (data: Record<string, boolean>) => {
       updateStore({ typeTags: data })
     },
-    [updateStore]
+    [updateStore],
   )
 
   const setTypeTagsAll = useCallback(() => {
@@ -63,7 +63,7 @@ export const useFilterProgressTag = () => {
       }
       updateStore({ progressTag: tag })
     },
-    [progressTag, updateStore]
+    [progressTag, updateStore],
   )
 
   return {

package/src/store/gameQuest.tsx

@@ -28,7 +28,7 @@ export const GameQuestContext = createContext<{
 const useQuestStatusQuery = (inProgressQuests: GameQuest[]) => {
   const gameQuestIds = inProgressQuests.map((quest) => quest.api_no)
   const unlockedGameQuest = Object.fromEntries(
-    inProgressQuests.map((quest) => [quest.api_no, quest])
+    inProgressQuests.map((quest) => [quest.api_no, quest]),
   )
   const alreadyCompletedQuest = getCompletedQuest(gameQuestIds)
   const lockedQuest = getLockedQuest(gameQuestIds)

package/src/store/kcwiki.ts

@@ -12,7 +12,7 @@ export const usePreferKcwiki = () => {
 }
 
 export const checkIsKcwikiSupportedLanguages = (
-  lang: string
+  lang: string,
 ): lang is keyof typeof kcwikiQuestData => {
   const kcwikiQuestData = getKcwikiQuestData()
   return lang in kcwikiQuestData

package/src/store/quest.ts

@@ -12,14 +12,14 @@ import { checkIsKcwikiSupportedLanguages, useKcwikiData } from './kcwiki'
 const DEFAULT_LANG = 'ja-JP'
 
 const checkIsKcanotifySupportedLanguages = (
-  lang: string
+  lang: string,
 ): lang is keyof typeof kcaQuestData => {
   const kcaQuestData = getKcanotifyQuestData()
   return lang in kcaQuestData
 }
 
 export const isSupportedLanguages = (
-  lang: string
+  lang: string,
 ): lang is keyof ReturnType<typeof getKcanotifyQuestData> =>
   checkIsKcanotifySupportedLanguages(lang) ||
   checkIsKcwikiSupportedLanguages(lang)

package/src/store/search.ts

@@ -1,7 +1,28 @@
-import { useCallback } from 'react'
-import { useThrottle } from 'react-use'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { useStore } from './store'
 
+// Fix https://github.com/streamich/react-use/issues/2488
+// Ported from https://hooks-guide.netlify.app/community/useThrottle
+const useThrottle = <T>(value: T, limit = 200) => {
+  const [throttledValue, setThrottledValue] = useState(value)
+  const lastRan = useRef(Date.now())
+  useEffect(() => {
+    const handler = setTimeout(
+      function () {
+        if (Date.now() - lastRan.current >= limit) {
+          setThrottledValue(value)
+          lastRan.current = Date.now()
+        }
+      },
+      limit - (Date.now() - lastRan.current),
+    )
+    return () => {
+      clearTimeout(handler)
+    }
+  }, [value, limit])
+  return throttledValue
+}
+
 export const useSearchInput = () => {
   const {
     store: { searchInput },
@@ -9,7 +30,7 @@ export const useSearchInput = () => {
   } = useStore()
   const setSearchInput = useCallback(
     (value: string) => updateStore({ searchInput: value }),
-    [updateStore]
+    [updateStore],
   )
   return {
     searchInput,

package/src/store/store.tsx

@@ -97,7 +97,7 @@ export const useStore = () => {
     (newStore: Partial<State>) => {
       setStore((previousStore) => ({ ...previousStore, ...newStore }))
     },
-    [setStore]
+    [setStore],
   )
 
   return { store, setStore, updateStore }

package/src/tags.tsx

@@ -173,7 +173,7 @@ export const TypeTags = () => {
   const { progressTag } = useFilterProgressTag()
 
   const inProgressQuest = gameQuests.filter((gameQuest) =>
-    isInProgressQuest(gameQuest)
+    isInProgressQuest(gameQuest),
   )
   const { typeTags, setTypeTags } = useFilterTags()