From f37605f9a283a72862a9655d5838ef221169ab26 Mon Sep 17 00:00:00 2001 From: Huakun Shen Date: Thu, 6 Feb 2025 21:54:35 -0500 Subject: [PATCH] Refactor: rename api subpackage (#93) * refactor(api): rename ui subpackage name * refactor(api): update import paths for template UI schemas * chore: update dependencies and bump package versions * chore(api): bump package version to 0.1.1 * refactor(api): rename IUiIframe to IUiCustom and related types * format --- apps/cli/CHANGELOG.md | 7 +++++++ apps/cli/package.json | 2 +- apps/create-kunkun/CHANGELOG.md | 7 +++++++ apps/create-kunkun/package.json | 2 +- .../routes/app/extension/ui-iframe/+page.svelte | 8 ++++---- .../routes/app/extension/ui-worker/+page.svelte | 10 +++++++--- packages/api/CHANGELOG.md | 6 ++++++ packages/api/jsr.json | 6 +++--- packages/api/package.json | 6 +++--- packages/api/src/api/client.ts | 2 +- packages/api/src/api/iframe-ui.ts | 4 ++-- packages/api/src/api/server-types.ts | 10 +++++----- packages/api/src/api/server/index.ts | 14 +++++++------- packages/api/src/api/server/ui.ts | 4 ++-- packages/api/src/api/worker-ui.ts | 4 ++-- packages/api/src/headless/index.ts | 2 +- packages/api/src/models/index.ts | 10 +++++----- packages/api/src/ui/{iframe => custom}/index.ts | 8 ++++---- packages/api/src/ui/index.ts | 2 +- .../ui/{worker => template}/components/action.ts | 0 .../ui/{worker => template}/components/common.ts | 0 .../{worker => template}/components/form-view.ts | 0 .../src/ui/{worker => template}/components/icon.ts | 0 .../ui/{worker => template}/components/index.ts | 0 .../{worker => template}/components/interfaces.ts | 0 .../{worker => template}/components/list-view.ts | 0 .../ui/{worker => template}/components/markdown.ts | 0 packages/api/src/ui/{worker => template}/ext.ts | 0 packages/api/src/ui/{worker => template}/index.ts | 4 ++-- .../schema/__test__/form.test.ts | 0 .../src/ui/{worker => template}/schema/action.ts | 0 .../api/src/ui/{worker => template}/schema/form.ts | 0 .../src/ui/{worker => template}/schema/index.ts | 0 .../src/ui/{worker => template}/schema/keyboard.ts | 0 .../api/src/ui/{worker => template}/schema/list.ts | 0 .../src/ui/{worker => template}/schema/markdown.ts | 0 packages/api/typedoc.json | 4 ++-- .../demo-worker-template-ext/CHANGELOG.md | 7 +++++++ .../demo-worker-template-ext/package.json | 2 +- .../demo-worker-template-ext/src/index.ts | 2 +- packages/extensions/ext-sveltekit-exp/CHANGELOG.md | 7 +++++++ packages/extensions/ext-sveltekit-exp/package.json | 2 +- .../src/lib/components/ThemeCustomizer.svelte | 2 +- .../ext-sveltekit-exp/src/routes/+layout.svelte | 2 +- .../ext-sveltekit-exp/src/routes/+page.svelte | 2 +- packages/extensions/form-view/README.md | 2 +- packages/extensions/form-view/src/index.ts | 2 +- .../jarvis/permissions/autogenerated/reference.md | 2 -- .../templates/template-ext-headless/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-headless/README.md | 2 +- .../templates/template-ext-headless/package.json | 2 +- packages/templates/template-ext-next/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-next/package.json | 2 +- .../template-ext-next/src/components/about.tsx | 2 +- .../template-ext-next/src/components/main.tsx | 2 +- packages/templates/template-ext-nuxt/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-nuxt/package.json | 2 +- .../templates/template-ext-nuxt/pages/index.vue | 2 +- packages/templates/template-ext-react/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-react/package.json | 2 +- packages/templates/template-ext-react/src/App.tsx | 2 +- .../templates/template-ext-svelte/CHANGELOG.md | 7 +++++++ .../templates/template-ext-svelte/package.json | 2 +- .../templates/template-ext-svelte/src/App.svelte | 2 +- .../src/lib/components/ThemeCustomizer.svelte | 2 +- .../templates/template-ext-sveltekit/CHANGELOG.md | 7 +++++++ .../templates/template-ext-sveltekit/package.json | 2 +- .../src/lib/components/ThemeCustomizer.svelte | 2 +- .../src/routes/+layout.svelte | 2 +- .../template-ext-sveltekit/src/routes/+page.svelte | 2 +- packages/templates/template-ext-vue/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-vue/package.json | 2 +- packages/templates/template-ext-vue/src/App.vue | 2 +- .../templates/template-ext-worker/CHANGELOG.md | 7 +++++++ packages/templates/template-ext-worker/README.md | 2 +- .../templates/template-ext-worker/package.json | 2 +- .../templates/template-ext-worker/src/index.ts | 2 +- 77 files changed, 172 insertions(+), 80 deletions(-) rename packages/api/src/ui/{iframe => custom}/index.ts (94%) rename packages/api/src/ui/{worker => template}/components/action.ts (100%) rename packages/api/src/ui/{worker => template}/components/common.ts (100%) rename packages/api/src/ui/{worker => template}/components/form-view.ts (100%) rename packages/api/src/ui/{worker => template}/components/icon.ts (100%) rename packages/api/src/ui/{worker => template}/components/index.ts (100%) rename packages/api/src/ui/{worker => template}/components/interfaces.ts (100%) rename packages/api/src/ui/{worker => template}/components/list-view.ts (100%) rename packages/api/src/ui/{worker => template}/components/markdown.ts (100%) rename packages/api/src/ui/{worker => template}/ext.ts (100%) rename packages/api/src/ui/{worker => template}/index.ts (98%) rename packages/api/src/ui/{worker => template}/schema/__test__/form.test.ts (100%) rename packages/api/src/ui/{worker => template}/schema/action.ts (100%) rename packages/api/src/ui/{worker => template}/schema/form.ts (100%) rename packages/api/src/ui/{worker => template}/schema/index.ts (100%) rename packages/api/src/ui/{worker => template}/schema/keyboard.ts (100%) rename packages/api/src/ui/{worker => template}/schema/list.ts (100%) rename packages/api/src/ui/{worker => template}/schema/markdown.ts (100%) diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md index 9055750..345914b 100644 --- a/apps/cli/CHANGELOG.md +++ b/apps/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # kksh +## 0.0.32 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.1.1 + ## 0.0.31 ### Patch Changes diff --git a/apps/cli/package.json b/apps/cli/package.json index e336a45..37aa708 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,7 +1,7 @@ { "name": "kksh", "module": "dist/cli.js", - "version": "0.0.31", + "version": "0.0.32", "type": "module", "bin": { "kksh": "./dist/cli.js", diff --git a/apps/create-kunkun/CHANGELOG.md b/apps/create-kunkun/CHANGELOG.md index e153fbf..a295b4b 100644 --- a/apps/create-kunkun/CHANGELOG.md +++ b/apps/create-kunkun/CHANGELOG.md @@ -1,5 +1,12 @@ # create-kunkun +## 0.1.44 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.1.1 + ## 0.1.43 ### Patch Changes diff --git a/apps/create-kunkun/package.json b/apps/create-kunkun/package.json index 6879e04..29ab9b9 100644 --- a/apps/create-kunkun/package.json +++ b/apps/create-kunkun/package.json @@ -1,7 +1,7 @@ { "name": "create-kunkun", "type": "module", - "version": "0.1.43", + "version": "0.1.44", "bin": { "create-kunkun": "dist/index.mjs" }, diff --git a/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte b/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte index 16bbd8c..9cb8d74 100644 --- a/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte +++ b/apps/desktop/src/routes/app/extension/ui-iframe/+page.svelte @@ -12,9 +12,9 @@ constructJarvisServerAPIWithPermissions, // exposeApiToWindow, type IApp, - type IUiIframe + type IUiCustom } from "@kksh/api/ui" - import { toast, type IUiIframeServer1, type IUiIframeServer2 } from "@kksh/api/ui/iframe" + import { toast, type IUiCustomServer1, type IUiCustomServer2 } from "@kksh/api/ui/custom" import { Button } from "@kksh/svelte5" import { cn } from "@kksh/ui/utils" import type { IKunkunFullServerAPI } from "@kunkunapi/src/api/server" @@ -49,7 +49,7 @@ transparentBg: false }) - const iframeUiAPI: IUiIframeServer2 = { + const iframeUiAPI: IUiCustomServer2 = { goBack: async () => { if (isInMainWindow()) { goto(i18n.resolveRoute("/app/")) @@ -113,7 +113,7 @@ iframeUi: { ...serverAPI.iframeUi, ...iframeUiAPI - } satisfies IUiIframeServer1 & IUiIframeServer2, + } satisfies IUiCustomServer1 & IUiCustomServer2, db: new db.JarvisExtDB(extInfoInDB.extId), kv: new db.KV(extInfoInDB.extId), app: { diff --git a/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte index a0a0379..825cd90 100644 --- a/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte +++ b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte @@ -6,7 +6,11 @@ import { listenToFileDrop, listenToRefreshDevExt } from "@/utils/tauri-events.js" import { isInMainWindow } from "@/utils/window.js" import { db } from "@kksh/api/commands" - import { constructJarvisServerAPIWithPermissions, type IApp, type IUiWorker } from "@kksh/api/ui" + import { + constructJarvisServerAPIWithPermissions, + type IApp, + type IUiTemplate + } from "@kksh/api/ui" import { FormNodeNameEnum, FormSchema, @@ -16,7 +20,7 @@ toast, type IComponent, type TemplateUiCommand - } from "@kksh/api/ui/worker" + } from "@kksh/api/ui/template" import { LoadingBar } from "@kksh/ui" import { Templates } from "@kksh/ui/extension" import { GlobalCommandPaletteFooter } from "@kksh/ui/main" @@ -73,7 +77,7 @@ } } - const extUiAPI: IUiWorker = { + const extUiAPI: IUiTemplate = { async render(view: IComponent) { if (view.nodeName === NodeNameEnum.List) { clearViewContent("list") diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index f3a68cd..826ea28 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -1,5 +1,11 @@ # @kksh/api +## 0.1.1 + +### Patch Changes + +- Rename api's 2 ui subpackage to less technical terms; iframe to custom and worker to template + ## 0.1.0 ### Minor Changes diff --git a/packages/api/jsr.json b/packages/api/jsr.json index b73ab91..05ca39f 100644 --- a/packages/api/jsr.json +++ b/packages/api/jsr.json @@ -1,13 +1,13 @@ { "$schema": "https://jsr.io/schema/config-file.v1.json", "name": "@kunkun/api", - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "exports": { ".": "./src/index.ts", "./ui": "./src/ui/index.ts", - "./ui/iframe": "./src/ui/iframe/index.ts", - "./ui/worker": "./src/ui/worker/index.ts", + "./ui/custom": "./src/ui/custom/index.ts", + "./ui/template": "./src/ui/template/index.ts", "./headless": "./src/headless/index.ts", "./models": "./src/models/index.ts", "./commands": "./src/commands/index.ts", diff --git a/packages/api/package.json b/packages/api/package.json index e90f0d7..7b386eb 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@kksh/api", - "version": "0.1.0", + "version": "0.1.1", "type": "module", "repository": { "type": "git", @@ -12,8 +12,8 @@ "exports": { ".": "./src/index.ts", "./ui": "./src/ui/index.ts", - "./ui/iframe": "./src/ui/iframe/index.ts", - "./ui/worker": "./src/ui/worker/index.ts", + "./ui/custom": "./src/ui/custom/index.ts", + "./ui/template": "./src/ui/template/index.ts", "./headless": "./src/headless/index.ts", "./models": "./src/models/index.ts", "./commands": "./src/commands/index.ts", diff --git a/packages/api/src/api/client.ts b/packages/api/src/api/client.ts index 3082c59..be2e57d 100644 --- a/packages/api/src/api/client.ts +++ b/packages/api/src/api/client.ts @@ -111,7 +111,7 @@ export interface IToast { error: GeneralToast } -export interface IUiIframe { +export interface IUiCustom { // goHome: () => Promise goBack: () => Promise hideBackButton: () => Promise diff --git a/packages/api/src/api/iframe-ui.ts b/packages/api/src/api/iframe-ui.ts index 71f1f6c..9db7213 100644 --- a/packages/api/src/api/iframe-ui.ts +++ b/packages/api/src/api/iframe-ui.ts @@ -1,10 +1,10 @@ // import type { Remote } from "@huakunshen/comlink" import type { IOs } from "tauri-api-adapter/client" -import { type IUiIframe } from "./client" +import { type IUiCustom } from "./client" export const KK_DRAG_REGION_ATTR = "data-kunkun-drag-region" -export function constructIframeUiAPI(api: { iframeUi: IUiIframe; os: IOs }): IUiIframe { +export function constructIframeUiAPI(api: { iframeUi: IUiCustom; os: IOs }): IUiCustom { return { goBack: api.iframeUi.goBack, hideBackButton: api.iframeUi.hideBackButton, diff --git a/packages/api/src/api/server-types.ts b/packages/api/src/api/server-types.ts index 720b9ae..d5b6a47 100644 --- a/packages/api/src/api/server-types.ts +++ b/packages/api/src/api/server-types.ts @@ -6,7 +6,7 @@ import type { IOPayload, SpawnOptions } from "tauri-plugin-shellx-api" -import type { DenoRunConfig, IUiIframe } from "./client" +import type { DenoRunConfig, IUiCustom } from "./client" export type IShellServer = IShellServer1 & { denoExecute( @@ -25,13 +25,13 @@ export type IShellServer = IShellServer1 & { } // This will be implemented in the @kksh/api package -export type IUiIframeServer1 = Pick< - IUiIframe, +export type IUiCustomServer1 = Pick< + IUiCustom, "startDragging" | "toggleMaximize" | "internalToggleMaximize" > // This interface will be implemented in iframe-ext.vue where iframe is loaded and API is exposed // because these API dependes on the context of the page -export type IUiIframeServer2 = Omit< - IUiIframe, +export type IUiCustomServer2 = Omit< + IUiCustom, "registerDragRegion" | "internalToggleMaximize" | "toggleMaximize" | "startDragging" > diff --git a/packages/api/src/api/server/index.ts b/packages/api/src/api/server/index.ts index 7dc0ea2..946353d 100644 --- a/packages/api/src/api/server/index.ts +++ b/packages/api/src/api/server/index.ts @@ -38,7 +38,7 @@ import { type UpdownloadPermission } from "tauri-api-adapter/permissions" import type { IEvent, IFs, IOpen, ISecurity, ISystem, IToast, IUtils } from "../../api/client" -import type { IUiIframeServer1 } from "../../api/server-types" +import type { IUiCustomServer1 } from "../../api/server-types" import { AllKunkunPermission, type EventPermission, @@ -65,8 +65,8 @@ import { } from "./toast" import { constructIframeUiApi - // type IUiIframeServer, - // type IUiWorkerServer + // type IUiCustomServer, + // type IUiTemplateServer } from "./ui" import { constructUtilsApi } from "./utils" @@ -79,13 +79,13 @@ export { } from "./toast" export { constructIframeUiApi - // type IUiIframeServer, - // type IUiWorkerServer + // type IUiCustomServer, + // type IUiTemplateServer } from "./ui" // export type IJarvisFullAPI = // // IFullAPI & -// ISystemServer & IToastServer & IDbServer & IUiWorkerServer & IUiIframeServer & IFsServer // IFsServer will override some methods in IFullAPI, it's fine because it's a superset +// ISystemServer & IToastServer & IDbServer & IUiTemplateServer & IUiCustomServer & IFsServer // IFsServer will override some methods in IFullAPI, it's fine because it's a superset type AllScopedPermissions = FsPermissionScoped | OpenPermissionScoped | ShellPermissionScoped type AllPermissions = AllKunkunPermission | AllScopedPermissions function getStringPermissions(permissions: AllPermissions[]): AllKunkunPermission[] { @@ -113,7 +113,7 @@ export type IKunkunFullServerAPI = { system: ISystem toast: IToast shell: IShellServer - iframeUi: IUiIframeServer1 + iframeUi: IUiCustomServer1 utils: IUtils security: ISecurity } diff --git a/packages/api/src/api/server/ui.ts b/packages/api/src/api/server/ui.ts index 1d5acc3..f9cd90c 100644 --- a/packages/api/src/api/server/ui.ts +++ b/packages/api/src/api/server/ui.ts @@ -1,13 +1,13 @@ import { invoke } from "@tauri-apps/api/core" import { getCurrentWindow } from "@tauri-apps/api/window" -import type { IUiIframeServer1 } from "../../api/server-types" +import type { IUiCustomServer1 } from "../../api/server-types" /** * Other APIs will be constructed in main window as they are used to manipulate UI directly * We can't access UI from here * @returns */ -export function constructIframeUiApi(): IUiIframeServer1 { +export function constructIframeUiApi(): IUiCustomServer1 { return { startDragging: () => { return getCurrentWindow().startDragging() diff --git a/packages/api/src/api/worker-ui.ts b/packages/api/src/api/worker-ui.ts index c550cc0..0d92ad5 100644 --- a/packages/api/src/api/worker-ui.ts +++ b/packages/api/src/api/worker-ui.ts @@ -1,7 +1,7 @@ // import { proxy, type Remote } from "@huakunshen/comlink" -// import type { IUiWorker } from "../client" +// import type { IUiTemplate } from "../client" -// export function constructWorkerUiAPI(api: Remote): IUiWorker { +// export function constructWorkerUiAPI(api: Remote): IUiTemplate { // return { // goBack: api.goBack, // render: api.render, diff --git a/packages/api/src/headless/index.ts b/packages/api/src/headless/index.ts index f98e550..61bd4c3 100644 --- a/packages/api/src/headless/index.ts +++ b/packages/api/src/headless/index.ts @@ -51,7 +51,7 @@ export type { IUpdownload, IFetch } from "tauri-api-adapter" -export type { ISystem, IToast, IUiIframe, IDb, IKV, IFs, IOpen, IEvent } from "../api/client" +export type { ISystem, IToast, IUiCustom, IDb, IKV, IFs, IOpen, IEvent } from "../api/client" export type { IShell } from "../api/shell" export { HeadlessCommand } from "./ext" /* -------------------------------------------------------------------------- */ diff --git a/packages/api/src/models/index.ts b/packages/api/src/models/index.ts index 1c65d4f..9c76e45 100644 --- a/packages/api/src/models/index.ts +++ b/packages/api/src/models/index.ts @@ -1,5 +1,5 @@ -export * as List from "../ui/worker/schema/list" -export * as Action from "../ui/worker/schema/action" +export * as List from "../ui/template/schema/list" +export * as Action from "../ui/template/schema/action" export * from "./constants" export * from "./icon" export * from "./apps" @@ -9,7 +9,7 @@ export * from "./manifest" export * from "./styles" export * from "./mdns" export { AllKunkunPermission, SystemPermissionSchema } from "../permissions" -export { Markdown as MarkdownSchema } from "../ui/worker/schema/markdown" -export * as ListSchema from "../ui/worker/schema/list" -export * as FormSchema from "../ui/worker/schema/form" +export { Markdown as MarkdownSchema } from "../ui/template/schema/markdown" +export * as ListSchema from "../ui/template/schema/list" +export * as FormSchema from "../ui/template/schema/form" export * from "./file-transfer" diff --git a/packages/api/src/ui/iframe/index.ts b/packages/api/src/ui/custom/index.ts similarity index 94% rename from packages/api/src/ui/iframe/index.ts rename to packages/api/src/ui/custom/index.ts index e6c8a72..310f167 100644 --- a/packages/api/src/ui/iframe/index.ts +++ b/packages/api/src/ui/custom/index.ts @@ -31,7 +31,7 @@ import type { ISecurity, ISystem, IToast, - IUiIframe, + IUiCustom, IUtils } from "../../api/client" import { constructEventAPI } from "../../api/event" @@ -40,10 +40,10 @@ import { constructPathAPI } from "../../api/path" import type { IShellServer } from "../../api/server-types" import { constructShellAPI } from "../../api/shell" -export { type IUiIframe } from "../../api/client" +export { type IUiCustom } from "../../api/client" // export { expose, wrap } from "@huakunshen/comlink" // export { type IDbServer } from "../server/db" -export { type IUiIframeServer2, type IUiIframeServer1 } from "../../api/server-types" +export { type IUiCustomServer2, type IUiCustomServer1 } from "../../api/server-types" /** * For the APIs annotated with "inherit from tauri-api-adapter", they inherit the client API completely from tauri-api-adapter @@ -68,7 +68,7 @@ type API = { updownload: IUpdownload // inherit from tauri-api-adapter sysInfo: ISystemInfo // inherit from tauri-api-adapter network: INetwork // inherit from tauri-api-adapter - iframeUi: IUiIframe // for kunkun + iframeUi: IUiCustom // for kunkun utils: IUtils // for kunkun security: ISecurity // for kunkun app: IApp diff --git a/packages/api/src/ui/index.ts b/packages/api/src/ui/index.ts index 30dfaa8..2360e9d 100644 --- a/packages/api/src/ui/index.ts +++ b/packages/api/src/ui/index.ts @@ -19,5 +19,5 @@ export type { IFetch } from "tauri-api-adapter" export * from "../api/client" // all client types -export type { IUiWorker } from "./worker" +export type { IUiTemplate } from "./template" export type { IShell } from "../api/shell" diff --git a/packages/api/src/ui/worker/components/action.ts b/packages/api/src/ui/template/components/action.ts similarity index 100% rename from packages/api/src/ui/worker/components/action.ts rename to packages/api/src/ui/template/components/action.ts diff --git a/packages/api/src/ui/worker/components/common.ts b/packages/api/src/ui/template/components/common.ts similarity index 100% rename from packages/api/src/ui/worker/components/common.ts rename to packages/api/src/ui/template/components/common.ts diff --git a/packages/api/src/ui/worker/components/form-view.ts b/packages/api/src/ui/template/components/form-view.ts similarity index 100% rename from packages/api/src/ui/worker/components/form-view.ts rename to packages/api/src/ui/template/components/form-view.ts diff --git a/packages/api/src/ui/worker/components/icon.ts b/packages/api/src/ui/template/components/icon.ts similarity index 100% rename from packages/api/src/ui/worker/components/icon.ts rename to packages/api/src/ui/template/components/icon.ts diff --git a/packages/api/src/ui/worker/components/index.ts b/packages/api/src/ui/template/components/index.ts similarity index 100% rename from packages/api/src/ui/worker/components/index.ts rename to packages/api/src/ui/template/components/index.ts diff --git a/packages/api/src/ui/worker/components/interfaces.ts b/packages/api/src/ui/template/components/interfaces.ts similarity index 100% rename from packages/api/src/ui/worker/components/interfaces.ts rename to packages/api/src/ui/template/components/interfaces.ts diff --git a/packages/api/src/ui/worker/components/list-view.ts b/packages/api/src/ui/template/components/list-view.ts similarity index 100% rename from packages/api/src/ui/worker/components/list-view.ts rename to packages/api/src/ui/template/components/list-view.ts diff --git a/packages/api/src/ui/worker/components/markdown.ts b/packages/api/src/ui/template/components/markdown.ts similarity index 100% rename from packages/api/src/ui/worker/components/markdown.ts rename to packages/api/src/ui/template/components/markdown.ts diff --git a/packages/api/src/ui/worker/ext.ts b/packages/api/src/ui/template/ext.ts similarity index 100% rename from packages/api/src/ui/worker/ext.ts rename to packages/api/src/ui/template/ext.ts diff --git a/packages/api/src/ui/worker/index.ts b/packages/api/src/ui/template/index.ts similarity index 98% rename from packages/api/src/ui/worker/index.ts rename to packages/api/src/ui/template/index.ts index 66b22a9..e0b8fe9 100644 --- a/packages/api/src/ui/worker/index.ts +++ b/packages/api/src/ui/template/index.ts @@ -47,7 +47,7 @@ import type { FormSchema, ListSchema, MarkdownSchema } from "../../models" import type { IComponent } from "./components" import type { TemplateUiCommand } from "./ext" -export interface IUiWorker { +export interface IUiTemplate { render: (view: IComponent) => Promise goBack: () => Promise showLoadingBar: (loading: boolean) => Promise @@ -82,7 +82,7 @@ type API = { updownload: IUpdownload // inherit from tauri-api-adapter sysInfo: ISystemInfo // inherit from tauri-api-adapter network: INetwork // inherit from tauri-api-adapter - workerUi: IUiWorker // for kunkun + workerUi: IUiTemplate // for kunkun security: ISecurity // for kunkun utils: IUtils // for kunkun app: IApp diff --git a/packages/api/src/ui/worker/schema/__test__/form.test.ts b/packages/api/src/ui/template/schema/__test__/form.test.ts similarity index 100% rename from packages/api/src/ui/worker/schema/__test__/form.test.ts rename to packages/api/src/ui/template/schema/__test__/form.test.ts diff --git a/packages/api/src/ui/worker/schema/action.ts b/packages/api/src/ui/template/schema/action.ts similarity index 100% rename from packages/api/src/ui/worker/schema/action.ts rename to packages/api/src/ui/template/schema/action.ts diff --git a/packages/api/src/ui/worker/schema/form.ts b/packages/api/src/ui/template/schema/form.ts similarity index 100% rename from packages/api/src/ui/worker/schema/form.ts rename to packages/api/src/ui/template/schema/form.ts diff --git a/packages/api/src/ui/worker/schema/index.ts b/packages/api/src/ui/template/schema/index.ts similarity index 100% rename from packages/api/src/ui/worker/schema/index.ts rename to packages/api/src/ui/template/schema/index.ts diff --git a/packages/api/src/ui/worker/schema/keyboard.ts b/packages/api/src/ui/template/schema/keyboard.ts similarity index 100% rename from packages/api/src/ui/worker/schema/keyboard.ts rename to packages/api/src/ui/template/schema/keyboard.ts diff --git a/packages/api/src/ui/worker/schema/list.ts b/packages/api/src/ui/template/schema/list.ts similarity index 100% rename from packages/api/src/ui/worker/schema/list.ts rename to packages/api/src/ui/template/schema/list.ts diff --git a/packages/api/src/ui/worker/schema/markdown.ts b/packages/api/src/ui/template/schema/markdown.ts similarity index 100% rename from packages/api/src/ui/worker/schema/markdown.ts rename to packages/api/src/ui/template/schema/markdown.ts diff --git a/packages/api/typedoc.json b/packages/api/typedoc.json index cc45e70..5581957 100644 --- a/packages/api/typedoc.json +++ b/packages/api/typedoc.json @@ -3,8 +3,8 @@ "entryPoints": [ "src/index.ts", "src/ui/index.ts", - "src/ui/iframe/index.ts", - "src/ui/worker/index.ts", + "src/ui/custom/index.ts", + "src/ui/template/index.ts", "src/models/index.ts", "src/commands/index.ts", "src/ui/api/permissions.ts", diff --git a/packages/extensions/demo-worker-template-ext/CHANGELOG.md b/packages/extensions/demo-worker-template-ext/CHANGELOG.md index bc40da2..9a6568f 100644 --- a/packages/extensions/demo-worker-template-ext/CHANGELOG.md +++ b/packages/extensions/demo-worker-template-ext/CHANGELOG.md @@ -1,5 +1,12 @@ # demo-template-extension +## 0.0.8 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.1.1 + ## 0.0.7 ### Patch Changes diff --git a/packages/extensions/demo-worker-template-ext/package.json b/packages/extensions/demo-worker-template-ext/package.json index a138873..574b27b 100644 --- a/packages/extensions/demo-worker-template-ext/package.json +++ b/packages/extensions/demo-worker-template-ext/package.json @@ -1,7 +1,7 @@ { "$schema": "../../schema/manifest-json-schema.json", "name": "demo-template-extension", - "version": "0.0.7", + "version": "0.0.8", "type": "module", "license": "MIT", "kunkun": { diff --git a/packages/extensions/demo-worker-template-ext/src/index.ts b/packages/extensions/demo-worker-template-ext/src/index.ts index f7ce837..38395b9 100644 --- a/packages/extensions/demo-worker-template-ext/src/index.ts +++ b/packages/extensions/demo-worker-template-ext/src/index.ts @@ -19,7 +19,7 @@ import { TemplateUiCommand, toast, ui -} from "@kksh/api/ui/worker" +} from "@kksh/api/ui/template" import { IconType } from "@kunkun/api/models" const nums = Array.from({ length: 20 }, (_, i) => i + 1) diff --git a/packages/extensions/ext-sveltekit-exp/CHANGELOG.md b/packages/extensions/ext-sveltekit-exp/CHANGELOG.md index 92f4953..8a5d443 100644 --- a/packages/extensions/ext-sveltekit-exp/CHANGELOG.md +++ b/packages/extensions/ext-sveltekit-exp/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-sveltekit +## 0.0.8 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.1.1 + ## 0.0.7 ### Patch Changes diff --git a/packages/extensions/ext-sveltekit-exp/package.json b/packages/extensions/ext-sveltekit-exp/package.json index 35bfa68..87c6dda 100644 --- a/packages/extensions/ext-sveltekit-exp/package.json +++ b/packages/extensions/ext-sveltekit-exp/package.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.kunkun.sh", "name": "ext-sveltekit-exp", - "version": "0.0.7", + "version": "0.0.8", "license": "MIT", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/extensions/ext-sveltekit-exp/src/lib/components/ThemeCustomizer.svelte b/packages/extensions/ext-sveltekit-exp/src/lib/components/ThemeCustomizer.svelte index d7b86b2..f36ebbf 100644 --- a/packages/extensions/ext-sveltekit-exp/src/lib/components/ThemeCustomizer.svelte +++ b/packages/extensions/ext-sveltekit-exp/src/lib/components/ThemeCustomizer.svelte @@ -1,6 +1,6 @@