[add] Preferences V5

src/preferences/default.ts

@@ -19,7 +19,7 @@ export default function getDefaultPreferences(
 ): Preferences {
   return {
     __is_poker__: true,
-    version: 4,
+    version: 5,
     fill_empty_window: false,
     refocus_window: false,
     launch_poker_contextmenu: true,
@@ -35,5 +35,6 @@ export function generateExampleOption(): SiteOption {
     name: '_DEFAULT_NAME_',
     url_pattern: `https://example.com?search=${cfg.KEYWORD_REPLACEHOLDER}`,
     access_mode: 'MOBILE',
+    width_size: 1
   }
 }

src/preferences/versions/index.ts

@@ -2,13 +2,19 @@ import { PreferencesV1 } from './v1-type'
 import { PreferencesV2 } from './v2-type'
 import { PreferencesV3 } from './v3-type'
 import { PreferencesV4 } from './v4-type'
+import { PreferencesV5 } from './v5-type'
+
+export type DefinePreferences<Ver, T> = Readonly<{
+  __is_poker__: true
+  version: Ver
+} & T>
 
 // -------- 每次添加新的版本后，都得修改这块地方 --------
 // -------- 隔壁 update.ts 的 updater 也要更新   --------
-export const CURRENT_PREFERENCES_VERSION = 4
-export * from './v4-type'
-export type LatestVersion = PreferencesV4
-export type AllVersion = LatestVersion | PreferencesV3 | PreferencesV2 | PreferencesV1
+export const CURRENT_PREFERENCES_VERSION = 5
+export * from './v5-type'
+export type LatestVersion = PreferencesV5
+export type AllVersion = LatestVersion | PreferencesV4 | PreferencesV3 | PreferencesV2 | PreferencesV1
 // ------------------------------------------------------
 
 export const checkVersion = (loaded_options: AllVersion) => {

src/preferences/versions/update.ts

@@ -2,20 +2,20 @@ import { AllVersion, LatestVersion } from '.'
 import { updater as v2Updater } from './v2'
 import { updater as v3Updater } from './v3'
 import { updater as v4Updater } from './v4'
+import { updater as v5Updater } from './v5'
 
 // -------- 每次添加新的版本后，都得修改这块地方 --------
 // -------- 隔壁 index.ts 也要更新               --------
 export function updatePreferences(s_opts: AllVersion): LatestVersion {
   switch (s_opts.version) {
     case 1:
       return updatePreferences(v2Updater(s_opts))
-
     case 2:
       return updatePreferences(v3Updater(s_opts))
-
     case 3:
       return updatePreferences(v4Updater(s_opts))
-
+    case 4:
+      return updatePreferences(v5Updater(s_opts))
     default:
       return s_opts
   }

src/preferences/versions/v1-type.ts

@@ -1,12 +1,12 @@
 type URLPattern = string
-export type SiteOption = {
+type SiteOption = {
   id: string
   icon: string
   name: string
   url_pattern: URLPattern
 }
-export type SiteRow = Array<SiteOption>
-export type SiteMatrix = Array<SiteRow>
+type SiteRow = Array<SiteOption>
+type SiteMatrix = Array<SiteRow>
 
 export type PreferencesV1 = Readonly<{
   version: 1

src/preferences/versions/v2-type.ts

@@ -1,13 +1,13 @@
-export type URLPattern = string
-export type SiteOption = {
+type URLPattern = string
+type SiteOption = {
   id: string
   icon: string | null
   name: string
   url_pattern: URLPattern
   enable_mobile: boolean
 }
-export type SiteRow = Array<SiteOption>
-export type SiteMatrix = Array<SiteRow>
+type SiteRow = Array<SiteOption>
+type SiteMatrix = Array<SiteRow>
 
 export type PreferencesV2 = Readonly<{
   version: 2

src/preferences/versions/v3-type.ts

@@ -1,21 +1,21 @@
-export type URLPattern = string
-export type SiteOption = {
+import { DefinePreferences } from './'
+
+type URLPattern = string
+type SiteOption = {
   id: string
   icon: string | null
   name: string
   url_pattern: URLPattern
   enable_mobile: boolean
 }
-export type SiteSettingsRow = {
+type SiteSettingsRow = {
   id: string
   name: string
   row: Array<SiteOption>
 }
-export type SiteSettings = Array<SiteSettingsRow>
+type SiteSettings = Array<SiteSettingsRow>
 
-export type PreferencesV3 = Readonly<{
-  __is_poker__: true,
-  version: 3
+export type PreferencesV3 = DefinePreferences<3, {
   launch_poker_contextmenu: boolean
   site_settings: SiteSettings
 }>

src/preferences/versions/v4-type.ts

@@ -1,22 +1,22 @@
-export type URLPattern = string
-export type SiteOption = {
+import { DefinePreferences } from './'
+
+type URLPattern = string
+type SiteOption = {
   id: string
   icon: string | null
   name: string
   url_pattern: URLPattern
   access_mode: 'DESKTOP' | 'MOBILE' | 'MOBILE-STRONG'
 }
-export type SiteSettingFloorID = string
-export type SiteSettingFloor = {
+type SiteSettingFloorID = string
+type SiteSettingFloor = {
   id: SiteSettingFloorID
   name: string
   row: Array<SiteOption>
 }
-export type SiteSettings = Array<SiteSettingFloor>
+type SiteSettings = Array<SiteSettingFloor>
 
-export type PreferencesV4 = Readonly<{
-  __is_poker__: true,
-  version: 4
+export type PreferencesV4 = DefinePreferences<4, {
   launch_poker_contextmenu: boolean
 
   fill_empty_window: boolean

src/preferences/versions/v4.ts

@@ -6,8 +6,7 @@ export function updater(v3: PreferencesV3): PreferencesV4 {
     __is_poker__: true,
     version: 4,
 
-    launch_poker_contextmenu: true,
-
+    launch_poker_contextmenu: v3.launch_poker_contextmenu,
     fill_empty_window: true,
     refocus_window: true,
 

src/preferences/versions/v5-type.ts

@@ -0,0 +1,33 @@
+// v2.0.0 启用
+
+import { DefinePreferences } from './'
+
+export type URLPattern = string
+export type SiteOption = {
+  id: string
+  icon: string | null
+  name: string
+  url_pattern: URLPattern
+  access_mode: 'DESKTOP' | 'MOBILE' | 'MOBILE-STRONG'
+  width_size: number
+}
+export type SiteSettingFloorID = string
+export type SiteSettingFloor = {
+  id: SiteSettingFloorID
+  name: string
+  row: Array<SiteOption>
+}
+export type SiteSettings = Array<SiteSettingFloor>
+
+export type PreferencesV5 = DefinePreferences<5, {
+  // 右键菜单栏【启动Poker】
+  launch_poker_contextmenu: boolean
+
+  // 将每一层的页面填充满
+  fill_empty_window: boolean
+
+  // 「唤回 Poker」窗口
+  refocus_window: boolean
+
+  site_settings: SiteSettings
+}>

src/preferences/versions/v5.ts

@@ -0,0 +1,22 @@
+import { PreferencesV4 } from './v4-type'
+import { PreferencesV5 } from './v5-type'
+
+export function updater(v4: PreferencesV4): PreferencesV5 {
+  return {
+    ...v4,
+
+    version: 5,
+
+    site_settings: v4.site_settings.map(settings_row => {
+      return {
+        ...settings_row,
+        row: settings_row.row.map(opt => {
+          return {
+            ...opt,
+            width_size: 1
+          }
+        })
+      }
+    }),
+  }
+}