fix: user tools config merging & tools type checking

Author: WRXinYue

client/options.ts

@@ -1,5 +1,6 @@
 import type { ValaxyAddon } from 'valaxy'
 import type { Live2DCollection, Live2dOptions, Live2dTips } from '../types'
+import defu from 'defu'
 import { useRuntimeConfig } from 'valaxy'
 import { computed } from 'vue'
 import { live2DCollection } from '../constants/live2dCollection'
@@ -10,19 +11,19 @@ import { filterLive2DCollection, mergeConfigs } from '../utils/config'
 export function useAddonLive2dConfig() {
   const runtimeConfig = useRuntimeConfig()
   return computed<Live2dOptions>(() => {
-    const { options } = runtimeConfig.value.addons['valaxy-addon-live2d'] as ValaxyAddon<Live2dOptions>
+    const { options: userOptions } = runtimeConfig.value.addons['valaxy-addon-live2d'] as ValaxyAddon<Live2dOptions>
 
-    const enableLive2D = options?.enableLive2D ?? 'all'
-    const mergedLive2DCollection: Live2DCollection = { ...live2DCollection, ...options?.live2DCollection }
+    const enableLive2D = userOptions?.enableLive2D ?? 'all'
+    const mergedLive2DCollection: Live2DCollection = { ...live2DCollection, ...userOptions?.live2DCollection }
 
     const filteredAndSortedLive2DCollection: Live2DCollection = (enableLive2D === 'all')
       ? mergedLive2DCollection
       : filterLive2DCollection(enableLive2D, mergedLive2DCollection)
 
-    const mergedLive2dTips = mergeConfigs(live2dTips, options?.live2dTips || {}) as Live2dTips
+    const mergedLive2dTips = mergeConfigs(live2dTips, userOptions?.live2dTips || {}) as Live2dTips
+    const options = defu(userOptions, defaultLive2DOptions)
 
     return {
-      ...defaultLive2DOptions,
       ...options,
 
       live2DCollection: filteredAndSortedLive2DCollection,

helpers/tips.ts

@@ -170,9 +170,6 @@ export class Live2dTipsHandler {
       return
     }
 
-    console.log("priority", priority);
-    console.log("this.currentPriority", this.currentPriority);
-    
     if (priority < this.currentPriority)
       return
 

node/config.ts

@@ -1,5 +1,5 @@
 import type { Live2dOptions } from '../types'
-import { captureLive2dImage, loadAsteroids, showHitokoto } from '../utils/tools'
+import { captureLive2dImage, loadAsteroids } from '../utils/tools'
 
 export const defaultLive2DOptions: Live2dOptions = {
   widthLimit: 250,

types/index.ts

@@ -46,7 +46,7 @@ export interface Live2dOptions {
   /**
    * 启用的工具列表
    */
-  tools?: Record<Live2DToolId, Live2DToolConfig>
+  tools?: Partial<Record<Live2DToolId, Partial<Live2DToolConfig>>>
   /**
    * 是否开启调试模式
    * @defaultValue false