diff --git a/.prettierignore b/.prettierignore index 86422ad..174a0a2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ .svelte-kit/ target/ +vendors/** vendors .nuxt/ diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 86cf587..682ed43 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -30,6 +30,7 @@ "@tauri-apps/plugin-shell": "^2.2.0", "@tauri-apps/plugin-stronghold": "^2.2.0", "dompurify": "^3.2.3", + "fuse.js": "^7.1.0", "gsap": "^3.12.5", "kkrpc": "^0.1.1", "lz-string": "^1.5.0", diff --git a/apps/desktop/src/lib/cmds/builtin.ts b/apps/desktop/src/lib/cmds/builtin.ts index eac0fa3..0a9a992 100644 --- a/apps/desktop/src/lib/cmds/builtin.ts +++ b/apps/desktop/src/lib/cmds/builtin.ts @@ -11,6 +11,7 @@ import { WebviewWindow } from "@tauri-apps/api/webviewWindow" import { exit } from "@tauri-apps/plugin-process" import { dev } from "$app/environment" import { goto } from "$app/navigation" +import Fuse from "fuse.js" import { toast } from "svelte-sonner" import { derived } from "svelte/store" import * as clipboard from "tauri-plugin-clipboard-api" @@ -475,11 +476,19 @@ export const rawBuiltinCmds: BuiltinCmd[] = [ } ].map((cmd) => ({ ...cmd, id: uuidv4() })) -export const builtinCmds = derived([appConfig, appState], ([$appConfig, $appState]) => { - return rawBuiltinCmds.filter((cmd) => { - const passDeveloper = cmd.flags?.developer ? $appConfig.developerMode : true - const passDev = cmd.flags?.dev ? dev : true - return passDeveloper && passDev - }) - // .filter((cmd) => commandScore(cmd.name, $appState.searchTerm, cmd.keywords) > 0.5) +export const fuse = new Fuse(rawBuiltinCmds, { + includeScore: true, + threshold: 0.2, + keys: ["name"] +}) + +export const builtinCmds = derived([appConfig, appState], ([$appConfig, $appState]) => { + return $appState.searchTerm + ? fuse + .search($appState.searchTerm) + .map((result) => result.item) + .filter( + (cmd) => (!cmd.flags?.developer || $appConfig.developerMode) && (!cmd.flags?.dev || dev) + ) + : rawBuiltinCmds }) diff --git a/apps/desktop/src/lib/cmds/system.ts b/apps/desktop/src/lib/cmds/system.ts index ad61697..a182901 100644 --- a/apps/desktop/src/lib/cmds/system.ts +++ b/apps/desktop/src/lib/cmds/system.ts @@ -1,10 +1,23 @@ import { getSystemCommands } from "@kksh/api/commands" import type { SysCommand } from "@kksh/api/models" import { commandScore } from "@kksh/ui/utils" +import Fuse from "fuse.js" import { derived, readable } from "svelte/store" import { appState } from "../stores/appState" -export const systemCommands = readable(getSystemCommands()) +export const systemCommands = getSystemCommands() + +export const fuse = new Fuse(systemCommands, { + includeScore: true, + threshold: 0.2, + keys: ["name"] +}) + +export const systemCommandsFiltered = derived(appState, ($appState) => { + return $appState.searchTerm + ? fuse.search($appState.searchTerm).map((result) => result.item) + : systemCommands +}) // export const systemCommandsFiltered = derived( // [systemCommands, appState], diff --git a/apps/desktop/src/lib/components/main/AppsCmds.svelte b/apps/desktop/src/lib/components/main/AppsCmds.svelte index e54ba3c..74db972 100644 --- a/apps/desktop/src/lib/components/main/AppsCmds.svelte +++ b/apps/desktop/src/lib/components/main/AppsCmds.svelte @@ -35,7 +35,7 @@ toast.error("Unsupported platform") } }} - value={app.name} + value={app.app_desktop_path} > void setDefaultAction: (defaultAction: string | null) => void setActionPanel: (actionPanel?: ActionSchema.ActionPanel) => void + setLockHideOnBlur: (lockHideOnBlur: boolean) => void } function createAppState(): Writable & AppStateAPI { @@ -35,6 +37,9 @@ function createAppState(): Writable & AppStateAPI { }, setActionPanel: (actionPanel?: ActionSchema.ActionPanel) => { store.update((state) => ({ ...state, actionPanel })) + }, + setLockHideOnBlur: (lockHideOnBlur: boolean) => { + store.update((state) => ({ ...state, lockHideOnBlur })) } } } diff --git a/apps/desktop/src/lib/stores/apps.ts b/apps/desktop/src/lib/stores/apps.ts index b4b9f8b..700b7c7 100644 --- a/apps/desktop/src/lib/stores/apps.ts +++ b/apps/desktop/src/lib/stores/apps.ts @@ -3,9 +3,16 @@ import { AppInfo } from "@kksh/api/models" import { commandScore } from "@kksh/ui/utils" import * as fs from "@tauri-apps/plugin-fs" import { platform } from "@tauri-apps/plugin-os" +import Fuse from "fuse.js" import { derived, get, writable } from "svelte/store" import { appState } from "./appState" +export const fuse = new Fuse([], { + includeScore: true, + threshold: 0.2, + keys: ["name"] +}) + export function createAppsLoaderStore() { const store = writable([]) @@ -28,24 +35,14 @@ export function createAppsLoaderStore() { // console.log("filteredApps", apps) // fs.writeTextFile("/Users/hk/Desktop/apps.json", JSON.stringify(apps)) store.set(apps) + fuse.setCollection(apps) } } } export const appsLoader = createAppsLoaderStore() - -// export const appsFiltered = derived([appsLoader, appState], ([$apps, $appState]) => { -// return [] -// return $apps.filter((app) => { -// if ($appState.searchTerm.length === 0) { -// return false -// } -// return ( -// commandScore( -// app.name, -// $appState.searchTerm -// // [] -// ) > 0.8 -// ) -// }) -// }) +export const appsFiltered = derived([appsLoader, appState], ([$apps, $appState]) => { + return $appState.searchTerm.length > 0 + ? fuse.search($appState.searchTerm).map((result) => result.item) + : $apps.slice(0, 20) +}) diff --git a/apps/desktop/src/lib/stores/extensions.ts b/apps/desktop/src/lib/stores/extensions.ts index d1da587..8b1f202 100644 --- a/apps/desktop/src/lib/stores/extensions.ts +++ b/apps/desktop/src/lib/stores/extensions.ts @@ -5,10 +5,17 @@ import * as extAPI from "@kksh/extension" import { commandScore } from "@kksh/ui/utils" import * as path from "@tauri-apps/api/path" import * as fs from "@tauri-apps/plugin-fs" +import Fuse from "fuse.js" import { derived, get, writable, type Readable, type Writable } from "svelte/store" import { appConfig } from "./appConfig" import { appState } from "./appState" +export const fuse = new Fuse([], { + includeScore: true, + threshold: 0.2, + keys: ["name"] +}) + function createExtensionsStore(): Writable & { init: () => Promise getExtensionsFromStore: () => ExtPackageJsonExtra[] @@ -40,6 +47,7 @@ function createExtensionsStore(): Writable & { function init() { return extAPI.loadAllExtensionsFromDb().then((exts) => { store.set(exts) + fuse.setCollection(exts) }) } @@ -245,6 +253,24 @@ export const devStoreExts: Readable = derived( } ) +export const installedStoreExtsFiltered = derived( + [installedStoreExts, appState], + ([$installedStoreExts, $appState]) => { + return $appState.searchTerm + ? fuse.search($appState.searchTerm).map((result) => result.item) + : $installedStoreExts + } +) + +export const devStoreExtsFiltered = derived( + [devStoreExts, appState], + ([$devStoreExts, $appState]) => { + return $appState.searchTerm + ? fuse.search($appState.searchTerm).map((result) => result.item) + : $devStoreExts + } +) + // export const installedStoreExtsFiltered = derived( // [installedStoreExts, appState], // ([$installedStoreExts, $appState]) => { diff --git a/apps/desktop/src/lib/stores/quick-links.ts b/apps/desktop/src/lib/stores/quick-links.ts index 7ce4e51..120ea98 100644 --- a/apps/desktop/src/lib/stores/quick-links.ts +++ b/apps/desktop/src/lib/stores/quick-links.ts @@ -2,9 +2,16 @@ import type { Icon } from "@kksh/api/models" import { createQuickLinkCommand, getAllQuickLinkCommands } from "@kksh/extension/db" import type { QuickLink } from "@kksh/ui/types" import { commandScore } from "@kksh/ui/utils" +import Fuse from "fuse.js" import { derived, get, writable, type Writable } from "svelte/store" import { appState } from "./appState" +export const fuse = new Fuse([], { + includeScore: true, + threshold: 0.2, + keys: ["name"] +}) + export interface QuickLinkAPI { get: () => QuickLink[] init: () => Promise @@ -21,7 +28,9 @@ function createQuickLinksStore(): Writable & QuickLinkAPI { async function refresh() { const cmds = await getAllQuickLinkCommands() - store.set(cmds.map((cmd) => ({ link: cmd.data.link, name: cmd.name, icon: cmd.data.icon }))) + const items = cmds.map((cmd) => ({ link: cmd.data.link, name: cmd.name, icon: cmd.data.icon })) + store.set(items) + fuse.setCollection(items) } async function createQuickLink(name: string, link: string, icon: Icon) { @@ -39,7 +48,11 @@ function createQuickLinksStore(): Writable & QuickLinkAPI { } export const quickLinks = createQuickLinksStore() - +export const quickLinksFiltered = derived([quickLinks, appState], ([$quickLinks, $appState]) => { + return $appState.searchTerm + ? fuse.search($appState.searchTerm).map((result) => result.item) + : $quickLinks +}) // export const quickLinksFiltered = derived([quickLinks, appState], ([$quicklinks, $appState]) => { // return $quicklinks.filter((lnk) => { // if ($appState.searchTerm.length === 0) { diff --git a/apps/desktop/src/routes/app/+layout.svelte b/apps/desktop/src/routes/app/+layout.svelte index 4ba4549..03adf5b 100644 --- a/apps/desktop/src/routes/app/+layout.svelte +++ b/apps/desktop/src/routes/app/+layout.svelte @@ -79,7 +79,7 @@ // this extra is focused check may be needed because blur event got triggered somehow when window show() // for edge case: when settings page is opened and focused, switch to main window, the blur event is triggered for main window if (!isFocused) { - if ($appConfig.hideOnBlur) { + if ($appConfig.hideOnBlur && !$appState.lockHideOnBlur) { win.hide() } } diff --git a/apps/desktop/src/routes/app/+page.svelte b/apps/desktop/src/routes/app/+page.svelte index 93da636..862a2cd 100644 --- a/apps/desktop/src/routes/app/+page.svelte +++ b/apps/desktop/src/routes/app/+page.svelte @@ -2,21 +2,23 @@