move item-check config

renderer/src/web/Config.ts

@@ -4,6 +4,7 @@ import { Host } from '@/web/background/IPC'
 import { HostConfig, ShortcutAction } from '@ipc/types'
 import type * as widget from './overlay/widgets'
 import type { StashSearchWidget } from './stash-search/widget'
+import type { ItemCheckWidget } from './item-check/widget'
 
 const _config = shallowRef<Config | null>(null)
 let _lastSavedConfig: Config | null = null
@@ -231,7 +232,7 @@ export const defaultConfig = (): Config => ({
           }
         ]
       }
-    } as widget.ItemCheckWidget,
+    } as ItemCheckWidget,
     {
       wmId: 4,
       wmType: 'delve-grid',
@@ -397,8 +398,8 @@ function upgradeConfig (_config: Config): Config {
 
   if (config.configVersion < 8) {
     const itemCheck = config.widgets.find(w => w.wmType === 'item-check')!
-    ;(itemCheck as widget.ItemCheckWidget).maps.showNewStats = false
-    itemCheck.maps.selectedStats = (itemCheck as widget.ItemCheckWidget).maps.selectedStats.map(entry => ({
+    ;(itemCheck as ItemCheckWidget).maps.showNewStats = false
+    itemCheck.maps.selectedStats = (itemCheck as ItemCheckWidget).maps.selectedStats.map(entry => ({
       matcher: entry.matcher,
       decision:
         (entry as any).valueDanger ? 'danger'
@@ -485,7 +486,7 @@ function upgradeConfig (_config: Config): Config {
       })
     })
 
-    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as widget.ItemCheckWidget
+    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as ItemCheckWidget
     itemCheck.wikiKey = (config as any).wikiKey
     itemCheck.poedbKey = null
     itemCheck.craftOfExileKey = (config as any).craftOfExileKey
@@ -501,7 +502,7 @@ function upgradeConfig (_config: Config): Config {
     const itemSearch = config.widgets.find(w => w.wmType === 'item-search') as widget.ItemSearchWidget
     itemSearch.ocrGemsKey = null
 
-    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as widget.ItemCheckWidget
+    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as ItemCheckWidget
     itemCheck.maps.profile = 1
     for (const stat of itemCheck.maps.selectedStats) {
       const p1decision =
@@ -519,7 +520,7 @@ function upgradeConfig (_config: Config): Config {
     const delve = config.widgets.find(w => w.wmType === 'delve-grid') as widget.DelveGridWidget
     delve.toggleKey = (config as any).delveGridKey
 
-    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as widget.ItemCheckWidget
+    const itemCheck = config.widgets.find(w => w.wmType === 'item-check') as ItemCheckWidget
     itemCheck.hotkey = (config as any).itemCheckKey
 
     if (itemCheck.maps.profile === undefined) {
@@ -571,7 +572,7 @@ function getConfigForHost (): HostConfig {
     action: { type: 'toggle-overlay' },
     keepModKeys: true
   })
-  const itemCheck = AppConfig('item-check') as widget.ItemCheckWidget
+  const itemCheck = AppConfig('item-check') as ItemCheckWidget
   if (itemCheck.wikiKey) {
     actions.push({
       shortcut: itemCheck.wikiKey,

renderer/src/web/item-check/WidgetItemCheck.vue

@@ -14,7 +14,8 @@ import { computed, inject, ref } from 'vue'
 import { MainProcess } from '@/web/background/IPC'
 import { ItemCategory, ItemRarity, parseClipboard, ParsedItem } from '@/parser'
 import { registerActions } from './hotkeyable-actions'
-import type { ItemCheckWidget, WidgetManager } from '../overlay/interfaces'
+import type { WidgetManager } from '../overlay/interfaces'
+import type { ItemCheckWidget } from './widget.js'
 
 import Widget from '../overlay/Widget.vue'
 import MapCheck from '../map-check/MapCheck.vue'

renderer/src/web/item-check/settings-item-check.vue

@@ -22,9 +22,9 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { configProp, configModelValue, findWidget } from './utils'
-import { ItemCheckWidget } from '@/web/overlay/interfaces'
-import HotkeyInput from './HotkeyInput.vue'
+import { configProp, configModelValue, findWidget } from '../settings/utils.js'
+import type { ItemCheckWidget } from './widget.js'
+import HotkeyInput from '../settings/HotkeyInput.vue'
 
 export default defineComponent({
   name: 'item.info',

renderer/src/web/item-check/widget.ts

@@ -0,0 +1,11 @@
+import type { Widget } from '../overlay/widgets.js'
+import type { MapCheckConfig } from '../map-check/common.js'
+
+export interface ItemCheckWidget extends Widget {
+  hotkey: string | null
+  wikiKey: string | null
+  poedbKey: string | null
+  craftOfExileKey: string | null
+  stashSearchKey: string | null
+  maps: MapCheckConfig
+}

renderer/src/web/map-check/MapCheck.vue

@@ -35,7 +35,7 @@ import { useI18n } from 'vue-i18n'
 import { ItemRarity, ParsedItem } from '@/parser'
 import { prepareMapStats } from './prepare-map-stats'
 import { STAT_BY_MATCH_STR } from '@/assets/data'
-import { ItemCheckWidget } from '../overlay/interfaces'
+import { ItemCheckWidget } from '../item-check/widget.js'
 import { AppConfig } from '@/web/Config'
 
 import MapStatButton from './MapStatButton.vue'

renderer/src/web/map-check/MapStatButton.vue

@@ -16,7 +16,7 @@
 import { computed, useCssModule } from 'vue'
 import { AppConfig } from '@/web/Config'
 import { PreparedStat } from './prepare-map-stats'
-import { ItemCheckWidget } from '../overlay/interfaces'
+import { ItemCheckWidget } from '../item-check/widget.js'
 import { nextDecision, decisionCreate } from './common.js'
 
 import ItemModifierText from '../ui/ItemModifierText.vue'

renderer/src/web/map-check/SettingsMatcherEntry.vue

@@ -22,8 +22,7 @@
 <script lang="ts">
 import { defineComponent, computed, PropType } from 'vue'
 import { useI18n } from 'vue-i18n'
-import type { ItemCheckWidget } from '@/web/overlay/interfaces'
-import { StatMatcher, StatTag, decisionHasColor, decisionCreate } from './common.js'
+import { StatMatcher, StatTag, decisionHasColor, decisionCreate, MapCheckConfig } from './common.js'
 
 export default defineComponent({
   emits: [],
@@ -33,7 +32,7 @@ export default defineComponent({
       required: true
     },
     selectedStats: {
-      type: Array as PropType<ItemCheckWidget['maps']['selectedStats']>,
+      type: Array as PropType<MapCheckConfig['selectedStats']>,
       required: true
     },
     profile: {

renderer/src/web/map-check/common.ts

@@ -1,3 +1,12 @@
+export interface MapCheckConfig {
+  profile: number
+  showNewStats: boolean
+  selectedStats: Array<{
+    matcher: string
+    decision: string
+  }>
+}
+
 export enum StatTag {
   Outdated = 1,
   HeistExclusive,

renderer/src/web/map-check/settings-maps.vue

@@ -33,7 +33,7 @@
 import { computed, defineComponent, ref } from 'vue'
 import { useI18nNs } from '@/web/i18n'
 import { configProp, findWidget } from '../settings/utils'
-import type { ItemCheckWidget } from '@/web/overlay/interfaces'
+import type { ItemCheckWidget } from '../item-check/widget.js'
 import { STATS_ITERATOR, STAT_BY_MATCH_STR } from '@/assets/data'
 import SettingsMatcherEntry from './SettingsMatcherEntry.vue'
 import VirtualScroll from '../ui/VirtualScroll.vue'

renderer/src/web/overlay/widgets.ts

@@ -45,22 +45,6 @@ export interface PriceCheckWidget extends Widget {
   rememberCurrency: boolean
 }
 
-export interface ItemCheckWidget extends Widget {
-  hotkey: string | null
-  wikiKey: string | null
-  poedbKey: string | null
-  craftOfExileKey: string | null
-  stashSearchKey: string | null
-  maps: {
-    profile: number
-    showNewStats: boolean
-    selectedStats: Array<{
-      matcher: string
-      decision: string
-    }>
-  }
-}
-
 export interface StopwatchWidget extends Widget {
   anchor: Anchor
   toggleKey: string | null

renderer/src/web/settings/SettingsWindow.vue

@@ -61,7 +61,7 @@ import SettingsChat from './chat.vue'
 import SettingsGeneral from './general.vue'
 import SettingsAbout from './about.vue'
 import SettingsPricecheck from './price-check.vue'
-import SettingsItemcheck from './item-check.vue'
+import SettingsItemcheck from '../item-check/settings-item-check.vue'
 import SettingsDebug from './debug.vue'
 import SettingsMaps from '../map-check/settings-maps.vue'
 import SettingsStashSearch from '../stash-search/stash-search-editor.vue'

renderer/src/web/settings/hotkeys.vue

@@ -51,7 +51,8 @@
 import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { configProp, configModelValue, findWidget } from './utils'
-import { PriceCheckWidget, DelveGridWidget, ItemCheckWidget } from '@/web/overlay/interfaces'
+import { PriceCheckWidget, DelveGridWidget } from '@/web/overlay/interfaces'
+import { ItemCheckWidget } from '../item-check/widget.js'
 import HotkeyInput from './HotkeyInput.vue'
 
 export default defineComponent({