diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..27b720e --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "semi": false, + "trailingComma": "none" +} diff --git a/build.ts b/build.ts index a99deb5..f4118ae 100644 --- a/build.ts +++ b/build.ts @@ -1,6 +1,6 @@ import { watch } from "fs" import { join } from "path" -import { refreshTemplateWorkerExtension } from "@kksh/api/dev" +import { refreshTemplateWorkerCommand } from "@kksh/api/dev" import { $ } from "bun" const entrypoints = ["./src/index.ts"] @@ -11,7 +11,7 @@ async function build() { await $`bun build --minify --target=browser --outdir=./dist ${entrypoint}` } if (Bun.argv.includes("dev")) { - await refreshTemplateWorkerExtension() + await refreshTemplateWorkerCommand() } } catch (error) { console.error(error) diff --git a/bun.lockb b/bun.lockb index e89d7b9..86eac33 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/jsr.json b/jsr.json index c79aebd..eed20e7 100644 --- a/jsr.json +++ b/jsr.json @@ -1,6 +1,6 @@ { "name": "@kunkun/kunkun-ext-browser-bookmark", - "version": "0.0.5", + "version": "0.0.6", "license": "MIT", "exports": "./mod.ts", "publish": { diff --git a/package.json b/package.json index 08b6c4a..cba8697 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "name": "Huakun", "url": "https://huakunshen.com" }, - "version": "0.0.5", + "version": "0.0.6", "repository": "https://github.com/kunkunsh/kunkun-ext-browser-bookmark", "type": "module", "kunkun": { @@ -98,7 +98,7 @@ "build": "bun build.ts" }, "dependencies": { - "@kksh/api": "^0.0.48", + "@kksh/api": "^0.1.1", "i18next": "^23.15.1", "valibot": "^0.40.0" }, diff --git a/src/bookmark.ts b/src/bookmark.ts index edfc930..9393c1c 100644 --- a/src/bookmark.ts +++ b/src/bookmark.ts @@ -1,4 +1,4 @@ -import { fs, os, path, shell, toast } from "@kksh/api/ui/worker" +import { fs, os, path, shell, toast } from "@kksh/api/ui/template" import * as v from "valibot" import { ChromeBookmarksFile } from "./types" import type { Browser, ChromeBookmark, Platform } from "./types" diff --git a/src/index.ts b/src/index.ts index ad550f7..397b9eb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,140 +1,143 @@ import { - Action, - app, - expose, - Form, - fs, - Icon, - IconEnum, - List, - NodeNameEnum, - open, - os, - path, - shell, - toast, - ui, - WorkerExtension -} from "@kksh/api/ui/worker" -import { ChromeBookmarks, createBookmarkLoader, type Bookmark } from "./bookmark" -import { setupI18n, t } from "./i18n" -import type { Platform } from "./types" + expose, + Icon, + IconEnum, + List, + open, + toast, + ui, + TemplateUiCommand +} from "@kksh/api/ui/template" +import { createBookmarkLoader, type Bookmark } from "./bookmark" -function bookmarkToItem(bookmark: Bookmark, options: { browserIcon: Icon }): List.Item { - return new List.Item({ - title: bookmark.name, - subTitle: bookmark.subtitle, - value: bookmark.url, - icon: bookmark.favicon - ? new Icon({ - type: IconEnum.RemoteUrl, - value: bookmark.favicon - }) - : new Icon({ - type: IconEnum.Iconify, - value: options.browserIcon.value - }), - accessories: [ - new List.ItemAccessory({ - icon: new Icon({ - type: IconEnum.Iconify, - value: options.browserIcon.value - }) - }) - ] - }) +function bookmarkToItem( + bookmark: Bookmark, + options: { browserIcon: Icon } +): List.Item { + return new List.Item({ + title: bookmark.name, + subTitle: bookmark.subtitle, + value: bookmark.url, + icon: bookmark.favicon + ? new Icon({ + type: IconEnum.RemoteUrl, + value: bookmark.favicon + }) + : new Icon({ + type: IconEnum.Iconify, + value: options.browserIcon.value + }), + accessories: [ + new List.ItemAccessory({ + icon: new Icon({ + type: IconEnum.Iconify, + value: options.browserIcon.value + }) + }) + ] + }) } -class BrowserBookmark extends WorkerExtension { - async onFormSubmit(value: Record): Promise { - console.log("Form submitted", value) - toast.success(`Form submitted: ${JSON.stringify(value)}`) - } - async load() { - ui.showLoadingBar(true) - ui.setSearchBarPlaceholder("Search for bookmarks") - ui.render(new List.List({})) - // const platform: Platform = await os.platform() - const [chromeBookmarks, edgeBookmarks, firefoxBookmarks] = await Promise.all([ - createBookmarkLoader("chrome").then((loader) => loader?.load() ?? []), - createBookmarkLoader("edge").then((loader) => loader?.load() ?? []), - createBookmarkLoader("firefox").then((loader) => loader?.load() ?? []) - ]) +class BrowserBookmark extends TemplateUiCommand { + async onFormSubmit(value: Record): Promise { + console.log("Form submitted", value) + toast.success(`Form submitted: ${JSON.stringify(value)}`) + } + async load() { + ui.showLoadingBar(true) + ui.setSearchBarPlaceholder("Search for bookmarks") + ui.render(new List.List({})) + // const platform: Platform = await os.platform() + const [chromeBookmarks, edgeBookmarks, firefoxBookmarks] = + await Promise.all([ + createBookmarkLoader("chrome").then((loader) => loader?.load() ?? []), + createBookmarkLoader("edge").then((loader) => loader?.load() ?? []), + createBookmarkLoader("firefox").then((loader) => loader?.load() ?? []) + ]) - const sections: List.Section[] = [] + const sections: List.Section[] = [] - if (firefoxBookmarks.length > 0) { - sections.push( - new List.Section({ - title: "Firefox", - subtitle: "Firefox", - items: firefoxBookmarks.map((bookmark) => - bookmarkToItem(bookmark, { - browserIcon: new Icon({ type: IconEnum.Iconify, value: "logos:firefox" }) - }) - ) - }) - ) - } + if (firefoxBookmarks.length > 0) { + sections.push( + new List.Section({ + title: "Firefox", + subtitle: "Firefox", + items: firefoxBookmarks.map((bookmark) => + bookmarkToItem(bookmark, { + browserIcon: new Icon({ + type: IconEnum.Iconify, + value: "logos:firefox" + }) + }) + ) + }) + ) + } - if (chromeBookmarks.length > 0) { - sections.push( - new List.Section({ - title: "Chrome", - subtitle: "Chrome", - items: chromeBookmarks.map((bookmark) => - bookmarkToItem(bookmark, { - browserIcon: new Icon({ type: IconEnum.Iconify, value: "logos:chrome" }) - }) - ) - }) - ) - } - if (edgeBookmarks.length > 0) { - sections.push( - new List.Section({ - title: "Edge", - subtitle: "Edge", - items: edgeBookmarks.map((bookmark) => - bookmarkToItem(bookmark, { - browserIcon: new Icon({ type: IconEnum.Iconify, value: "logos:microsoft-edge" }) - }) - ) - }) - ) - } + if (chromeBookmarks.length > 0) { + sections.push( + new List.Section({ + title: "Chrome", + subtitle: "Chrome", + items: chromeBookmarks.map((bookmark) => + bookmarkToItem(bookmark, { + browserIcon: new Icon({ + type: IconEnum.Iconify, + value: "logos:chrome" + }) + }) + ) + }) + ) + } + if (edgeBookmarks.length > 0) { + sections.push( + new List.Section({ + title: "Edge", + subtitle: "Edge", + items: edgeBookmarks.map((bookmark) => + bookmarkToItem(bookmark, { + browserIcon: new Icon({ + type: IconEnum.Iconify, + value: "logos:microsoft-edge" + }) + }) + ) + }) + ) + } - return ui - .setSearchBarPlaceholder("Enter a search term, and press enter to search") - .then(async () => { - return ui.render(new List.List({ sections })) - }) - .finally(() => { - ui.showLoadingBar(false) - }) - } + return ui + .setSearchBarPlaceholder("Enter a search term, and press enter to search") + .then(async () => { + return ui.render(new List.List({ sections })) + }) + .finally(() => { + ui.showLoadingBar(false) + }) + } - async onActionSelected(actionValue: string): Promise { - switch (actionValue) { - case "open": - break + async onActionSelected(actionValue: string): Promise { + switch (actionValue) { + case "open": + break - default: - break - } - } + default: + break + } + } - onSearchTermChange(term: string): Promise { - return Promise.resolve() - } + onSearchTermChange(term: string): Promise { + return Promise.resolve() + } - onListItemSelected(value: string): Promise { - console.log("Item selected:", value) - if (value.startsWith("http")) { - open.url(value) - } - return Promise.resolve() - } + onListItemSelected(value: string): Promise { + console.log("Item selected:", value) + if (value.startsWith("http")) { + open.url(value) + } + return Promise.resolve() + } } expose(new BrowserBookmark()) diff --git a/src/types.ts b/src/types.ts index 5f05237..f015efb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -import { os } from "@kksh/api/ui/worker" +import { os } from "@kksh/api/ui/template" import * as v from "valibot" export type Platform = Awaited>