poi-plugin-quest-info-2 0.7.2 → 0.7.3

package/src/__tests__/kcanotifyData.spec.ts

@@ -15,3 +15,16 @@ Array [
 ]
 `)
 })
+
+describe('should format correct', () => {
+  Object.keys(QuestData).forEach((lang) => {
+    test(`${lang} key format`, () => {
+      Object.keys(QuestData[lang as keyof typeof QuestData]).forEach((key) => {
+        // gameId should not extra space
+        expect(key.trim()).toEqual(key)
+        // gameId should be number
+        expect(String(+key)).toEqual(key)
+      })
+    })
+  })
+})

package/src/__tests__/kcwikiData.spec.ts

@@ -1,4 +1,5 @@
 import { version, KcwikiQuestData } from '../../build/kcQuestsData'
+import newQuestData from '../../build/kcQuestsData/quests-scn-new.json'
 
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
@@ -25,4 +26,13 @@ describe('should format correct', () => {
       expect(String(+key)).toEqual(key)
     })
   })
+
+  test('new quest key format', () => {
+    Object.keys(newQuestData).forEach((gameId) => {
+      // gameId should not extra space
+      expect(gameId.trim()).toEqual(gameId)
+      // gameId should be number
+      expect(String(+gameId)).toEqual(gameId)
+    })
+  })
 })

package/src/__tests__/questCategory.spec.ts

@@ -21,11 +21,11 @@ describe('should questCategory correct', () => {
       Object.entries(questCategory).map(([key, val]) => [
         key,
         val
-          .sort((a, b) => +a - +b)
+          .sort((a, b) => a - b)
           .map((gameId) => ({
             gameId,
-            code: mergeData[gameId as keyof typeof mergeData].code,
-            name: mergeData[gameId as keyof typeof mergeData].name,
+            code: mergeData[String(gameId) as keyof typeof mergeData].code,
+            name: mergeData[String(gameId) as keyof typeof mergeData].name,
           })),
       ])
     )

package/src/components/QuestCard/MinimalQuestCard.tsx

@@ -1,19 +1,16 @@
-import { Elevation, Text, Tooltip } from '@blueprintjs/core'
-import React from 'react'
+import { Card, Elevation, Text, Tooltip } from '@blueprintjs/core'
+import React, { forwardRef } from 'react'
+import type { StyledComponentProps } from 'styled-components'
 import { guessQuestCategory, QUEST_STATUS } from '../../questHelper'
 import type { QuestCardProps } from './index'
 import { CardBody, CardTail, CatIndicator, FlexCard } from './styles'
 import { questStatusMap } from './utils'
 
-export const MinimalQuestCard: React.FC<QuestCardProps> = ({
-  code,
-  name,
-  desc,
-  tip,
-  status = QUEST_STATUS.DEFAULT,
-  onClick,
-  style,
-}) => {
+export const MinimalQuestCard = forwardRef<
+  Card,
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  QuestCardProps & StyledComponentProps<typeof Card, any, {}, never>
+>(({ code, name, desc, tip, status = QUEST_STATUS.DEFAULT, ...props }, ref) => {
   const indicatorColor = guessQuestCategory(code).color
   const TailIcon = questStatusMap[status]
 
@@ -29,10 +26,10 @@ export const MinimalQuestCard: React.FC<QuestCardProps> = ({
       }
     >
       <FlexCard
+        ref={ref}
         elevation={Elevation.ZERO}
         interactive={true}
-        onClick={onClick}
-        style={style}
+        {...props}
       >
         <CatIndicator color={indicatorColor}></CatIndicator>
         <CardBody>
@@ -45,4 +42,4 @@ export const MinimalQuestCard: React.FC<QuestCardProps> = ({
       </FlexCard>
     </Tooltip>
   )
-}
+})

package/src/components/QuestCard/index.tsx

@@ -1,74 +1,105 @@
-import { Elevation, H5, Text } from '@blueprintjs/core'
-import React from 'react'
-import styled from 'styled-components'
+import { Card, Elevation, H5, Text } from '@blueprintjs/core'
+import React, { forwardRef } from 'react'
+import type { StyledComponentProps } from 'styled-components'
 import { usePluginTranslation } from '../../poi/hooks'
-import { guessQuestCategory, QUEST_STATUS } from '../../questHelper'
-import { PreTaskTag } from '../PreTaskTag'
-import { CardBody, CardMedia, CardTail, FlexCard } from './styles'
+import { getPrePost, guessQuestCategory, QUEST_STATUS } from '../../questHelper'
+import { QuestTag } from '../QuestTag'
+import {
+  CardActionWrapper,
+  CardBody,
+  CardMedia,
+  CardTail,
+  FlexCard,
+  SpanText,
+  TagsWrapper,
+} from './styles'
 import { questIconMap, questStatusMap } from './utils'
 
 export type QuestCardProps = {
+  gameId: number
   code: string
   name: string
   desc: string | JSX.Element
   tip?: string
   tip2?: string
   status?: QUEST_STATUS
-  preTask?: string[]
-  onClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void
-  style?: React.CSSProperties
+  preQuest?: string[]
 }
 
-const PreTaskTagWrapper = styled.div`
-  display: flex;
-  align-items: baseline;
-`
-
-export const LargeQuestCard = ({
-  code,
-  name,
-  desc,
-  tip,
-  tip2,
-  preTask,
-  status = QUEST_STATUS.DEFAULT,
-  onClick,
-  style,
-}: QuestCardProps) => {
-  const headIcon = questIconMap[guessQuestCategory(code).type]
-  const TailIcon = questStatusMap[status]
+const CardAction = ({ gameId }: { gameId: number }) => {
   const { t } = usePluginTranslation()
 
+  const preQuests = getPrePost(gameId)
+
   return (
-    <FlexCard
-      elevation={Elevation.ZERO}
-      interactive={false}
-      onClick={onClick}
-      style={style}
-    >
-      <CardMedia src={headIcon}></CardMedia>
-      <CardBody>
-        <H5>{[code, name].filter((i) => i != undefined).join(' - ')}</H5>
-        <Text>{desc}</Text>
-        {tip2 && <b>{tip2}</b>}
-        {tip && <i>{tip}</i>}
-        <PreTaskTagWrapper>
-          {!!preTask?.length && <span>{t('Requires')}</span>}
-          {preTask?.map((i) => (
-            <PreTaskTag key={i} code={i}></PreTaskTag>
-          ))}
-        </PreTaskTagWrapper>
-      </CardBody>
+    <CardActionWrapper>
+      <TagsWrapper>
+        {!!preQuests.pre.length && (
+          <>
+            <SpanText>{t('Requires')}</SpanText>
+            {preQuests.pre.map((i) => (
+              <QuestTag key={i} code={i}></QuestTag>
+            ))}
+          </>
+        )}
+      </TagsWrapper>
 
-      <CardTail>
-        <TailIcon />
-      </CardTail>
-    </FlexCard>
+      <TagsWrapper>
+        {!!preQuests.post.length && (
+          <>
+            <SpanText>{t('Unlocks')}</SpanText>
+            {preQuests.post.map((i) => (
+              <QuestTag key={i} code={i}></QuestTag>
+            ))}
+          </>
+        )}
+      </TagsWrapper>
+    </CardActionWrapper>
   )
 }
 
-export const QuestCard: React.FC<QuestCardProps & { gameId: string }> = ({
-  ...props
-}) => {
-  return <LargeQuestCard {...props}></LargeQuestCard>
-}
+export const QuestCard = forwardRef<
+  Card,
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  QuestCardProps & StyledComponentProps<typeof Card, any, {}, never>
+>(
+  (
+    {
+      gameId,
+      code,
+      name,
+      desc,
+      tip,
+      tip2,
+      status = QUEST_STATUS.DEFAULT,
+      ...props
+    },
+    ref
+  ) => {
+    const headIcon = questIconMap[guessQuestCategory(code).type]
+    const TailIcon = questStatusMap[status]
+
+    return (
+      <FlexCard
+        ref={ref}
+        elevation={Elevation.ZERO}
+        interactive={false}
+        {...props}
+      >
+        <CardMedia src={headIcon}></CardMedia>
+        <CardBody>
+          <H5>{[code, name].filter((i) => i != undefined).join(' - ')}</H5>
+          <Text>{desc}</Text>
+          {tip2 && <b>{tip2}</b>}
+          {tip && <i>{tip}</i>}
+
+          <CardAction gameId={gameId}></CardAction>
+        </CardBody>
+
+        <CardTail>
+          <TailIcon />
+        </CardTail>
+      </FlexCard>
+    )
+  }
+)

package/src/components/QuestCard/styles.ts

@@ -40,3 +40,20 @@ export const CardTail = styled.div`
     height: 20px;
   }
 `
+
+export const CardActionWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: baseline;
+`
+
+export const TagsWrapper = styled.div`
+  display: flex;
+  flex: 1;
+  flex-wrap: wrap;
+  align-items: center;
+`
+
+export const SpanText = styled.span`
+  white-space: nowrap;
+`

package/src/components/QuestList.tsx

@@ -11,7 +11,6 @@ import type { ListRowProps } from 'react-virtualized'
 import styled from 'styled-components'
 import { QUEST_STATUS } from '../questHelper'
 import type { UnionQuest } from '../questHelper'
-import { useLargeCard } from '../store'
 import { QuestCard } from './QuestCard'
 import { useIsQuestPluginTab } from '../poi/hooks'
 import { QUEST_API_STATE } from '../poi/types'
@@ -67,7 +66,7 @@ const useQuestsRowRenderer = (quests: UnionQuest[]) => {
               desc={desc}
               tip={memo}
               tip2={memo2}
-              preTask={pre}
+              preQuest={pre}
               status={questStatus}
             ></QuestCard>
           </div>
@@ -80,16 +79,14 @@ const useQuestsRowRenderer = (quests: UnionQuest[]) => {
 }
 
 export const QuestList: React.FC<{ quests: UnionQuest[] }> = ({ quests }) => {
-  const { largeCard } = useLargeCard()
   const activeTab = useIsQuestPluginTab()
   const listRef = useRef<List>(null)
   const rowRenderer: ListRowRenderer = useQuestsRowRenderer(quests)
 
   useEffect(() => {
-    const largeCardIdx = quests.findIndex((i) => i.gameId === largeCard)
     cache.clearAll()
-    listRef.current?.recomputeRowHeights(largeCardIdx)
-  }, [quests, largeCard])
+    listRef.current?.recomputeRowHeights()
+  }, [quests])
 
   useEffect(() => {
     if (activeTab) {

package/src/components/{PreTaskTag.tsx → QuestTag.tsx}

@@ -6,15 +6,16 @@ import { useFilterTags } from '../store/filterTags'
 import { useSearchInput } from '../store/search'
 
 const TagWrapper = styled(Tag)`
-  margin: 0 4px;
+  margin: 2px 4px;
   user-select: none;
+  overflow: visible;
 
   & > span {
     cursor: pointer;
   }
 `
 
-export const PreTaskTag = ({ code }: { code: string }) => {
+export const QuestTag = ({ code }: { code: string }) => {
   const { setSearchInput } = useSearchInput()
   const { setCategoryTagsAll, setTypeTagsAll } = useFilterTags()
 

package/src/questHelper.ts

@@ -1,5 +1,6 @@
 import questCategory from '../build/questCategory.json'
 import newQuestData from '../build/kcQuestsData/quests-scn-new.json'
+import prePostQuest from '../build/prePostQuest.json'
 import { GameQuest, QUEST_API_STATE } from './poi/types'
 
 type DocQuest = {
@@ -29,7 +30,7 @@ type DocQuest = {
 }
 
 export type UnionQuest = {
-  gameId: string
+  gameId: number
   gameQuest?: GameQuest
   docQuest: DocQuest
 }
@@ -40,7 +41,7 @@ const monthlyQuest = new Set(questCategory.monthlyQuest)
 const quarterlyQuest = new Set(questCategory.quarterlyQuest)
 const yearlyQuest = new Set(questCategory.yearlyQuest)
 const singleQuest = new Set(questCategory.singleQuest)
-const newQuest = new Set(newQuestData)
+const newQuest = new Set(newQuestData.map((gameId) => +gameId))
 
 export const isInProgressQuest = (quest: GameQuest) =>
   quest.api_state === QUEST_API_STATE.IN_PROGRESS ||
@@ -196,6 +197,13 @@ export const isUnknownCategoryQuest = ({ code }: DocQuest) =>
   // Starts with unknown character
   /^[^ABCDEFG]/.test(code)
 
+export const getPrePost = (gameId: number) => {
+  if (!(gameId in prePostQuest)) {
+    return { pre: [], post: [] }
+  }
+  return prePostQuest[String(gameId) as keyof typeof prePostQuest]
+}
+
 export enum QUEST_STATUS {
   LOCKED,
   DEFAULT,

package/src/store/quest.ts

@@ -44,12 +44,12 @@ export const useQuest = (): UnionQuest[] => {
 
   if (syncWithGame && gameQuest.length) {
     return gameQuest.map((quest) => {
-      const gameId = String(quest.api_no)
+      const gameId = quest.api_no
       if (gameId in docQuestMap) {
         return {
           gameId,
           gameQuest: quest,
-          docQuest: docQuestMap[gameId as keyof typeof docQuestMap],
+          docQuest: docQuestMap[String(gameId) as keyof typeof docQuestMap],
         }
       }
 
@@ -68,7 +68,7 @@ export const useQuest = (): UnionQuest[] => {
   } else {
     // Return all recorded quests
     return Object.entries(docQuestMap).map(([gameId, val]) => ({
-      gameId,
+      gameId: +gameId,
       // Maybe empty
       gameQuest: gameQuest.find((quest) => quest.api_no === Number(gameId))!,
       docQuest: val,

package/scripts/convertAssets.ts

@@ -1,57 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { prepareDir } from './utils'
-
-const ASSETS_PATH = path.resolve('assets')
-const OUTPUT_PATH = path.resolve('build')
-const OUTPUT_FILE = path.resolve(OUTPUT_PATH, 'assets.ts')
-const CONVERT_EXTS = ['jpg', 'png'] as const
-
-const HEADER = `/* eslint-disable prettier/prettier */
-/**
- * This file was automatically generated by \`${path.relative(
-   // project root
-   process.cwd(),
-   __filename
- )}\`
- * Do not edit this file directly.
- */` as const
-
-function base64Encode(file: string) {
-  const bitmap = fs.readFileSync(file)
-  return bitmap.toString('base64')
-}
-
-function main() {
-  prepareDir(OUTPUT_PATH)
-  const imageData = fs
-    .readdirSync(ASSETS_PATH)
-    // exclusive ignored ext
-    .filter((f) => CONVERT_EXTS.some((ext) => f.endsWith('.' + ext)))
-    .map((fileName) => {
-      const filePath = path.resolve(ASSETS_PATH, fileName)
-      const parsedFile = path.parse(fileName)
-      return {
-        name: parsedFile.name,
-        ext: parsedFile.ext.slice(1),
-        base64: base64Encode(filePath),
-      }
-    })
-
-  const data = `${HEADER}
-
-${imageData
-  .map(
-    ({ name, ext, base64 }) =>
-      `export const ${name} = 'data:image/${ext};base64, ${base64}'`
-  )
-  .join('\n')}
-`
-
-  fs.writeFileSync(OUTPUT_FILE, data)
-
-  // eslint-disable-next-line no-console
-  console.log('Converted', imageData.length, 'images.')
-}
-
-main()

package/scripts/downloadKcQuestsData.ts

@@ -1,136 +0,0 @@
-/* eslint-disable no-console */
-import { existsSync, readFileSync, writeFileSync } from 'fs'
-import pangu from 'pangu'
-import path from 'path'
-import { fetch } from './proxyFetch'
-import { prepareDir } from './utils'
-
-// See https://github.com/kcwikizh/kcQuests
-
-const OUTPUT_PATH = path.resolve('build', 'kcQuestsData')
-const DATA_FILE_NAME = 'quests-scn.json'
-const DATA_URL = `https://kcwikizh.github.io/kcQuests/${DATA_FILE_NAME}`
-const NEW_QUEST_FILE_NAME = 'quests-scn-new.json'
-const NEW_QUEST_URL = `https://kcwikizh.github.io/kcQuests/${NEW_QUEST_FILE_NAME}`
-const VERSION_URL =
-  'https://api.github.com/repos/kcwikizh/kcQuests/branches/main'
-
-// maybe need ignore some expired quest
-const IGNORE_DATA = [] as const
-
-const getRemoteVersion = async () => {
-  const resp = await fetch(VERSION_URL)
-  if (!resp.ok) {
-    throw new Error(`Fetch Error!\nurl: ${resp.url}\nstatus: ${resp.status}`)
-  }
-  return (await resp.json()).commit.sha
-}
-
-const getLocalVersion = () => {
-  const localVersionFile = path.resolve(OUTPUT_PATH, 'DATA_VERSION')
-  const version = existsSync(localVersionFile)
-    ? readFileSync(localVersionFile).toString()
-    : '0'
-  return version
-}
-
-/**
- * @example
- * ```ts
- * import zh_CN from './quests-scn.json'
- * export default {
- *   'zh-CN': zh_CN,
- * }
- * export const version = '5.1.2.1'
- * ```
- */
-const genTS = (version: string) => {
-  const importCode = `import zh_CN from './quests-scn.json'`
-
-  const exportCode = [
-    'export const KcwikiQuestData = {',
-    `  'zh-CN': zh_CN,`,
-    '}',
-  ].join('\n')
-
-  const versionCode = `export const version = '${version}'`
-  return `${importCode}\n\n${exportCode}\n\n${versionCode}\n`
-}
-
-const downloadQuestData = async () => {
-  const resp = await fetch(DATA_URL)
-  if (!resp.ok) {
-    console.error(`Fetch Error!\nurl: ${resp.url}\nstatus: ${resp.status}`)
-    return
-  }
-  const text = await resp.text()
-
-  const json = JSON.parse(text) as {
-    [gameId: string]: {
-      code: string
-      name: string
-      desc: string
-      memo?: string
-      memo2?: string
-    }
-  }
-  for (const gameId in json) {
-    const { code, name, desc, memo, memo2 } = json[gameId]
-    json[gameId].code = code.trim()
-    json[gameId].name = pangu.spacing(name)
-    json[gameId].desc = pangu.spacing(desc)
-    if (memo) {
-      json[gameId].memo = pangu.spacing(memo)
-    }
-    if (memo2) {
-      json[gameId].memo2 = pangu.spacing(memo2)
-    }
-  }
-
-  IGNORE_DATA.forEach((gameId) => delete json[gameId])
-  const data = JSON.stringify(json, undefined, 2)
-  writeFileSync(path.resolve(OUTPUT_PATH, DATA_FILE_NAME), data)
-}
-
-const downloadNewQuest = async () => {
-  const resp = await fetch(NEW_QUEST_URL)
-  if (!resp.ok) {
-    console.error(`Fetch Error!\nurl: ${resp.url}\nstatus: ${resp.status}`)
-    return
-  }
-  const text = await resp.text()
-  const json = Object.keys(JSON.parse(text))
-  const data = JSON.stringify(json, undefined, 2)
-  writeFileSync(path.resolve(OUTPUT_PATH, NEW_QUEST_FILE_NAME), data)
-}
-
-const main = async () => {
-  const args = process.argv.slice(2)
-
-  prepareDir(OUTPUT_PATH)
-  const remoteVersion = await getRemoteVersion()
-  const localVersion = getLocalVersion()
-  if (remoteVersion === localVersion) {
-    console.log('The local version is up to date. Version:', localVersion)
-    if (!args.find((v) => v === '-f' || v === '--force')) {
-      return
-    }
-  } else {
-    console.log('New Version Detected. Version:', remoteVersion)
-  }
-
-  console.log(`Download kcQuests data...`)
-  await Promise.all([downloadQuestData(), downloadNewQuest()])
-
-  const ts = genTS(remoteVersion)
-  writeFileSync(`${OUTPUT_PATH}/index.ts`, ts)
-
-  // Finally record the version number
-  writeFileSync(`${OUTPUT_PATH}/DATA_VERSION`, remoteVersion)
-}
-
-main()
-
-process.on('unhandledRejection', (up) => {
-  throw up
-})