fix(settings): fuzzy search

addons/launcher/src/renderer/LauncherList.vue

@@ -33,22 +33,16 @@ let isEditing: boolean = $ref(false)
 let keyword = $ref('')
 
 const keywords = $computed(() => {
-  return keyword.trim().toLowerCase().split(/\s+/)
-    .map(item => item.trim())
-    .filter(Boolean)
+  return commas.helper.getWords(keyword)
 })
 
 const filteredLaunchers = $computed(() => {
   return launchers.filter(launcher => {
     if (isCollapsed) {
       if (!getTerminalTabByLauncher(launcher)) return false
     }
-    if (keywords.length) {
-      const matched = keywords.every(
-        item => Object.values(launcher).join(' ').toLowerCase().includes(item),
-      )
-      if (!matched) return false
-    }
+    const matched = commas.helper.matches(Object.values(launcher), keywords)
+    if (!matched) return false
     return true
   })
 })

addons/settings/src/renderer/SettingsPane.vue

@@ -50,7 +50,7 @@ const groups = $computed(() => {
       key,
       name,
       from,
-      rows: keyword ? rows.filter(row => row.key.includes(keyword)) : rows,
+      rows: rows.filter(row => commas.helper.matches([row.key, commas.remote.translate(row.label)], keyword)),
     }
   }).filter(group => group.rows.length)
 })

api/modules/helper.ts

@@ -1,6 +1,7 @@
 import { mix, toRGBA, toCSSHEX } from '../../src/shared/color'
 import { deepRef, surface, useAsyncComputed, watchBaseEffect } from '../../src/shared/compositions'
 import { createIDGenerator, iterate, reuse } from '../../src/shared/helper'
+import { getWords, matches } from '../../src/shared/match'
 import { omitHome, resolveHome } from '../../src/shared/terminal'
 
 export {
@@ -16,4 +17,6 @@ export {
   toRGBA,
   toCSSHEX,
   mix,
+  getWords,
+  matches,
 }

src/shared/match.ts

@@ -0,0 +1,12 @@
+export function getWords(text: string) {
+  return text.trim().toLowerCase().split(/\s+/)
+    .map(item => item.trim())
+    .filter(Boolean)
+}
+
+export function matches(source: string | string[], keywords: string | string[]) {
+  const words = Array.isArray(keywords) ? keywords : getWords(keywords)
+  if (!words.length) return true
+  const text = (Array.isArray(source) ? source.join(' ') : source).toLowerCase()
+  return words.every(item => text.includes(item))
+}