From 75c7914fb1aed0b38a460e2242f9562bc4ef7bb0 Mon Sep 17 00:00:00 2001
From: qwqcode <22412567+qwqcode@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:24:53 +0800
Subject: [PATCH] refactor(ui/types): better `ArtalkType` import and export
 (#620)

---
 .../src/components/PageEditor.vue             | 14 ++++++------
 .../src/components/SiteCreate.vue             |  6 ++---
 .../src/components/SiteEditor.vue             | 10 ++++-----
 .../src/components/SiteSwitcher.vue           |  1 -
 .../src/components/UserEditor.vue             |  4 ++--
 ui/packages/artalk-sidebar/src/global.ts      |  4 ++--
 .../artalk-sidebar/src/pages/pages.vue        |  8 +++----
 .../artalk-sidebar/src/pages/sites.vue        | 14 ++++++------
 .../artalk-sidebar/src/pages/transfer.vue     |  1 -
 .../artalk-sidebar/src/pages/users.vue        | 12 +++++-----
 ui/packages/artalk-sidebar/src/stores/nav.ts  |  4 ++--
 ui/packages/artalk/package.json               |  1 +
 ui/packages/artalk/src/api/api-base.ts        |  6 ++---
 ui/packages/artalk/src/api/comment.ts         |  2 +-
 ui/packages/artalk/src/api/index.ts           |  6 ++---
 ui/packages/artalk/src/api/page.ts            |  2 +-
 ui/packages/artalk/src/api/request.ts         |  8 +++----
 ui/packages/artalk/src/api/site.ts            |  2 +-
 ui/packages/artalk/src/api/system.ts          |  2 +-
 ui/packages/artalk/src/api/user.ts            |  2 +-
 ui/packages/artalk/src/artalk.ts              | 11 +++-------
 ui/packages/artalk/src/comment/comment.ts     |  5 ++---
 .../artalk/src/components/action-btn.ts       |  6 ++---
 ui/packages/artalk/src/components/dialog.ts   |  6 ++---
 ui/packages/artalk/src/config.ts              |  2 +-
 ui/packages/artalk/src/context.ts             |  5 +----
 ui/packages/artalk/src/data.ts                |  3 +--
 ui/packages/artalk/src/defaults.ts            |  2 +-
 ui/packages/artalk/src/editor/editor.ts       |  6 ++---
 ui/packages/artalk/src/editor/state.ts        |  3 +--
 ui/packages/artalk/src/layer/layer.ts         |  4 ++--
 ui/packages/artalk/src/layer/sidebar-layer.ts |  4 ++--
 ui/packages/artalk/src/lib/checker/index.ts   |  9 ++++----
 ui/packages/artalk/src/lib/component.ts       |  7 +++---
 ui/packages/artalk/src/lib/dark-mode.ts       | 10 ++++-----
 ui/packages/artalk/src/lib/user.ts            |  7 +++---
 ui/packages/artalk/src/lib/utils.ts           |  8 +++----
 ui/packages/artalk/src/list/comment.ts        |  5 ++---
 ui/packages/artalk/src/list/layout.ts         |  2 +-
 ui/packages/artalk/src/list/list.ts           |  4 ++--
 ui/packages/artalk/src/list/nest.ts           |  2 +-
 ui/packages/artalk/src/list/page.ts           |  3 +--
 .../artalk/src/list/paginator/index.ts        |  3 +--
 .../artalk/src/list/paginator/read-more.ts    |  2 +-
 ui/packages/artalk/src/main.ts                |  2 ++
 .../artalk/src/plugins/conf-remoter.ts        |  3 +--
 ui/packages/artalk/src/plugins/editor-kit.ts  |  3 +--
 .../artalk/src/plugins/editor/_plug.ts        |  3 +--
 .../artalk/src/plugins/editor/emoticons.ts    |  2 +-
 .../artalk/src/plugins/editor/index.ts        |  2 +-
 .../artalk/src/plugins/editor/state-edit.ts   |  2 +-
 .../artalk/src/plugins/editor/state-reply.ts  |  2 +-
 .../artalk/src/plugins/editor/submit-add.ts   |  2 +-
 .../artalk/src/plugins/editor/submit.ts       |  2 +-
 ui/packages/artalk/src/plugins/index.ts       |  2 +-
 .../artalk/src/plugins/list/copyright.ts      |  2 +-
 ui/packages/artalk/src/plugins/list/count.ts  |  2 +-
 .../artalk/src/plugins/list/dropdown.ts       |  2 +-
 .../artalk/src/plugins/list/error-dialog.ts   |  3 +--
 ui/packages/artalk/src/plugins/list/fetch.ts  |  3 +--
 .../artalk/src/plugins/list/goto-first.ts     |  2 +-
 ui/packages/artalk/src/plugins/list/goto.ts   |  2 +-
 ui/packages/artalk/src/plugins/list/index.ts  |  2 +-
 .../artalk/src/plugins/list/loading.ts        |  2 +-
 .../artalk/src/plugins/list/no-comment.ts     |  2 +-
 .../artalk/src/plugins/list/reach-bottom.ts   |  2 +-
 .../artalk/src/plugins/list/sidebar-btn.ts    |  2 +-
 .../artalk/src/plugins/list/time-ticking.ts   |  2 +-
 .../artalk/src/plugins/list/unread-badge.ts   |  2 +-
 ui/packages/artalk/src/plugins/list/unread.ts |  2 +-
 .../artalk/src/plugins/list/with-editor.ts    |  4 +---
 ui/packages/artalk/src/plugins/markdown.ts    |  2 +-
 ui/packages/artalk/src/plugins/stat.ts        |  3 +--
 .../artalk/src/plugins/version-check.ts       |  2 +-
 ui/packages/artalk/src/service.ts             | 22 +++++++++----------
 .../types/{artalk-config.d.ts => config.ts}   |  4 ++--
 .../artalk/types/{context.d.ts => context.ts} |  6 ++---
 .../types/{artalk-data.d.ts => data.ts}       |  0
 .../artalk/types/{editor.d.ts => editor.ts}   |  2 +-
 .../artalk/types/{event.d.ts => event.ts}     |  4 ++--
 ui/packages/artalk/types/index.ts             |  6 +++++
 ui/packages/artalk/types/plugin.d.ts          |  4 ----
 ui/packages/artalk/types/plugin.ts            |  3 +++
 ui/packages/artalk/vite.config.ts             |  1 +
 84 files changed, 164 insertions(+), 184 deletions(-)
 rename ui/packages/artalk/types/{artalk-config.d.ts => config.ts} (97%)
 rename ui/packages/artalk/types/{context.d.ts => context.ts} (94%)
 rename ui/packages/artalk/types/{artalk-data.d.ts => data.ts} (100%)
 rename ui/packages/artalk/types/{editor.d.ts => editor.ts} (97%)
 rename ui/packages/artalk/types/{event.d.ts => event.ts} (95%)
 create mode 100644 ui/packages/artalk/types/index.ts
 delete mode 100644 ui/packages/artalk/types/plugin.d.ts
 create mode 100644 ui/packages/artalk/types/plugin.ts

diff --git a/ui/packages/artalk-sidebar/src/components/PageEditor.vue b/ui/packages/artalk-sidebar/src/components/PageEditor.vue
index 9b430fe65..482f1661c 100644
--- a/ui/packages/artalk-sidebar/src/components/PageEditor.vue
+++ b/ui/packages/artalk-sidebar/src/components/PageEditor.vue
@@ -1,19 +1,19 @@
 <script setup lang="ts">
-import type { PageData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 import { artalk } from '../global'
 
 const props = defineProps<{
-  page: PageData
+  page: ArtalkType.PageData
 }>()
 
 const emit = defineEmits<{
   (evt: 'close'): void
-  (evt: 'update', page: PageData): void
+  (evt: 'update', page: ArtalkType.PageData): void
   (evt: 'remove', id: number): void
 }>()
 
 const { page } = toRefs(props)
-const editFieldKey = ref<keyof PageData|null>(null)
+const editFieldKey = ref<keyof ArtalkType.PageData|null>(null)
 const editFieldVal = computed(() => String(editFieldKey ? page.value[editFieldKey.value!] || '' : ''))
 const isLoading = ref(false)
 const { t } = useI18n()
@@ -28,7 +28,7 @@ function editKey() {
 
 async function editAdminOnly() {
   isLoading.value = true
-  let p: PageData
+  let p: ArtalkType.PageData
   try {
     p = await artalk!.ctx.getApi().page.pageEdit({ ...page.value, admin_only: !page.value.admin_only })
   } catch (err: any) {
@@ -41,7 +41,7 @@ async function editAdminOnly() {
 
 async function sync() {
   isLoading.value = true
-  let p: PageData
+  let p: ArtalkType.PageData
   try {
     p = (await artalk!.ctx.getApi().page.pageFetch(page.value.id)).page
   } catch (err: any) {
@@ -76,7 +76,7 @@ function close() {
 async function onFieldEditorYes(val: string) {
   if (editFieldVal.value !== val) {
     isLoading.value = true
-    let p: PageData
+    let p: ArtalkType.PageData
     try {
       p = await artalk!.ctx.getApi().page.pageEdit({ ...page.value, [editFieldKey.value as any]: val })
     } catch (err: any) {
diff --git a/ui/packages/artalk-sidebar/src/components/SiteCreate.vue b/ui/packages/artalk-sidebar/src/components/SiteCreate.vue
index a879a84ce..0ebdcd7ee 100644
--- a/ui/packages/artalk-sidebar/src/components/SiteCreate.vue
+++ b/ui/packages/artalk-sidebar/src/components/SiteCreate.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { artalk } from '../global'
-import type { SiteData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 
 const { t } = useI18n()
 
@@ -10,7 +10,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (evt: 'close'): void
-  (evt: 'done', siteNew: SiteData): void
+  (evt: 'done', siteNew: ArtalkType.SiteData): void
 }>()
 
 const isLoading = ref(false)
@@ -31,7 +31,7 @@ async function submit() {
   if (siteName === '') { alert('请输入站点名称'); return }
 
   isLoading.value = true
-  let s: SiteData
+  let s: ArtalkType.SiteData
   try {
     s = await artalk!.ctx.getApi().site.siteAdd(siteName, siteUrls)
   } catch (err: any) {
diff --git a/ui/packages/artalk-sidebar/src/components/SiteEditor.vue b/ui/packages/artalk-sidebar/src/components/SiteEditor.vue
index 3cd28d543..cd0d77612 100644
--- a/ui/packages/artalk-sidebar/src/components/SiteEditor.vue
+++ b/ui/packages/artalk-sidebar/src/components/SiteEditor.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
-import type { SiteData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 import { artalk } from '../global'
 
 const props = defineProps<{
-  site: SiteData
+  site: ArtalkType.SiteData
 }>()
 
 const emit = defineEmits<{
   (evt: 'close'): void
-  (evt: 'update', page: SiteData): void
+  (evt: 'update', page: ArtalkType.SiteData): void
   (evt: 'remove', id: number): void
 }>()
 
 const { site } = toRefs(props)
 const isLoading = ref(false)
-const editFieldKey = ref<keyof SiteData|null>(null)
+const editFieldKey = ref<keyof ArtalkType.SiteData|null>(null)
 const editFieldVal = computed(() => {
   if (editFieldKey.value === 'urls') return site.value.urls_raw || ''
   return String(editFieldKey ? site.value[editFieldKey.value!] || '' : '')
@@ -58,7 +58,7 @@ function del() {
 async function onFieldEditorYes(val: string) {
   if (editFieldVal.value !== val) {
     isLoading.value = true
-    let s: SiteData
+    let s: ArtalkType.SiteData
     try {
       s = await artalk!.ctx.getApi().site.siteEdit({ ...site.value, [editFieldKey.value as any]: val })
     } catch (err: any) {
diff --git a/ui/packages/artalk-sidebar/src/components/SiteSwitcher.vue b/ui/packages/artalk-sidebar/src/components/SiteSwitcher.vue
index 590ac73ff..fc9f4db2a 100644
--- a/ui/packages/artalk-sidebar/src/components/SiteSwitcher.vue
+++ b/ui/packages/artalk-sidebar/src/components/SiteSwitcher.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { SiteData } from 'artalk/types/artalk-data'
 import { storeToRefs } from 'pinia';
 import { useNavStore } from '../stores/nav'
 import { useUserStore } from '../stores/user'
diff --git a/ui/packages/artalk-sidebar/src/components/UserEditor.vue b/ui/packages/artalk-sidebar/src/components/UserEditor.vue
index dd325d0b2..1710f3ff0 100644
--- a/ui/packages/artalk-sidebar/src/components/UserEditor.vue
+++ b/ui/packages/artalk-sidebar/src/components/UserEditor.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { artalk, bootParams } from '../global'
-import type { UserData, UserDataForAdmin } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 
 const { t } = useI18n()
 
@@ -22,7 +22,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (evt: 'close'): void
-  (evt: 'update', user: UserDataForAdmin): void
+  (evt: 'update', user: ArtalkType.UserDataForAdmin): void
 }>()
 
 const user = ref<IUserEditData>()
diff --git a/ui/packages/artalk-sidebar/src/global.ts b/ui/packages/artalk-sidebar/src/global.ts
index b8ada45be..8e87c308c 100644
--- a/ui/packages/artalk-sidebar/src/global.ts
+++ b/ui/packages/artalk-sidebar/src/global.ts
@@ -1,5 +1,5 @@
 import Artalk from 'artalk'
-import type { LocalUser } from 'artalk/types/artalk-config'
+import type { ArtalkType } from 'artalk'
 import { useUserStore } from './stores/user'
 const { t } = useI18n()
 
@@ -13,7 +13,7 @@ export function getBootParams() {
   return {
     pageKey:    p.get('pageKey') || '',
     site:       p.get('site') || '',
-    user:       <LocalUser>JSON.parse(p.get('user') || '{}'),
+    user:       <ArtalkType.LocalUser>JSON.parse(p.get('user') || '{}'),
     view:       p.get('view') || '',
     viewParams: <any>null,
     darkMode:   p.get('darkMode') === '1',
diff --git a/ui/packages/artalk-sidebar/src/pages/pages.vue b/ui/packages/artalk-sidebar/src/pages/pages.vue
index ac20fb072..0e943a848 100644
--- a/ui/packages/artalk-sidebar/src/pages/pages.vue
+++ b/ui/packages/artalk-sidebar/src/pages/pages.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
 import { artalk } from '../global'
-import type { PageData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 import { useNavStore } from '../stores/nav'
 import { useUserStore } from '../stores/user'
 import Pagination from '../components/Pagination.vue'
 
 const nav = useNavStore()
 const { site: curtSite } = storeToRefs(useUserStore())
-const pages = ref<PageData[]>([])
+const pages = ref<ArtalkType.PageData[]>([])
 const curtEditPageID = ref<number|null>(null)
 const { t } = useI18n()
 
@@ -53,7 +53,7 @@ function scrollHandler() {
   showActBarBorder.value = (nav.scrollableArea!.scrollTop > 10)
 }
 
-function editPage(page: PageData) {
+function editPage(page: ArtalkType.PageData) {
   curtEditPageID.value = page.id
 }
 
@@ -73,7 +73,7 @@ function onChangePage(offset: number) {
   reqPages(offset)
 }
 
-function onPageItemUpdate(page: PageData) {
+function onPageItemUpdate(page: ArtalkType.PageData) {
   const index = pages.value.findIndex(p => p.id === page.id)
   if (index != -1) {
     const orgPage = pages.value[index]
diff --git a/ui/packages/artalk-sidebar/src/pages/sites.vue b/ui/packages/artalk-sidebar/src/pages/sites.vue
index 18519a275..1e89cb4de 100644
--- a/ui/packages/artalk-sidebar/src/pages/sites.vue
+++ b/ui/packages/artalk-sidebar/src/pages/sites.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { useNavStore } from '../stores/nav'
 import { artalk, bootParams } from '../global'
-import type { SiteData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 
 const nav = useNavStore()
-const sites = ref<SiteData[]>([])
-const curtEditSite = ref<SiteData|null>(null)
+const sites = ref<ArtalkType.SiteData[]>([])
+const curtEditSite = ref<ArtalkType.SiteData|null>(null)
 const showSiteCreate = ref(false)
 const siteCreateInitVal = ref()
 const { t } = useI18n()
@@ -42,7 +42,7 @@ function create() {
 const sitesGrouped = computed(() => {
   if (sites.value.length === 0) return []
 
-  const grp: SiteData[][] = []
+  const grp: ArtalkType.SiteData[][] = []
   let j = -1
   for (let i = 0; i < sites.value.length; i++) {
     const item = sites.value[i]
@@ -55,18 +55,18 @@ const sitesGrouped = computed(() => {
   return grp
 })
 
-function edit(site: SiteData) {
+function edit(site: ArtalkType.SiteData) {
   showSiteCreate.value = false
   curtEditSite.value = site
 }
 
-function onNewSiteCreated(siteNew: SiteData) {
+function onNewSiteCreated(siteNew: ArtalkType.SiteData) {
   sites.value.push(siteNew)
   showSiteCreate.value = false
   nav.refreshSites()
 }
 
-function onSiteItemUpdate(site: SiteData) {
+function onSiteItemUpdate(site: ArtalkType.SiteData) {
   const index = sites.value.findIndex(s => s.id === site.id)
   if (index != -1) {
     const orgSite = sites.value[index]
diff --git a/ui/packages/artalk-sidebar/src/pages/transfer.vue b/ui/packages/artalk-sidebar/src/pages/transfer.vue
index 4c07859b3..524985a89 100644
--- a/ui/packages/artalk-sidebar/src/pages/transfer.vue
+++ b/ui/packages/artalk-sidebar/src/pages/transfer.vue
@@ -2,7 +2,6 @@
 import { useNavStore } from '../stores/nav'
 import { useUserStore } from '../stores/user'
 import { artalk } from '../global'
-import type { SiteData } from 'artalk/types/artalk-data'
 import { storeToRefs } from 'pinia';
 
 const nav = useNavStore()
diff --git a/ui/packages/artalk-sidebar/src/pages/users.vue b/ui/packages/artalk-sidebar/src/pages/users.vue
index 51429cc79..2c1ff9877 100644
--- a/ui/packages/artalk-sidebar/src/pages/users.vue
+++ b/ui/packages/artalk-sidebar/src/pages/users.vue
@@ -2,13 +2,13 @@
 import { useNavStore } from '../stores/nav'
 import { artalk, bootParams } from '../global'
 import Pagination from '../components/Pagination.vue'
-import type { UserDataForAdmin } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 import { storeToRefs } from 'pinia'
 
 const nav = useNavStore()
 const router = useRouter()
 const { curtTab } = storeToRefs(nav)
-const users = ref<UserDataForAdmin[]>([])
+const users = ref<ArtalkType.UserDataForAdmin[]>([])
 const { t } = useI18n()
 
 const pageSize = ref(30)
@@ -17,7 +17,7 @@ const pagination = ref<InstanceType<typeof Pagination>>()
 const curtType = ref('all')
 
 const addingUser = ref(false)
-const editingUser = ref<UserDataForAdmin|undefined>()
+const editingUser = ref<ArtalkType.UserDataForAdmin|undefined>()
 
 onMounted(() => {
   nav.updateTabs({
@@ -65,7 +65,7 @@ function onChangePage(offset: number) {
   reqUsers(offset)
 }
 
-function editUser(user: UserDataForAdmin) {
+function editUser(user: ArtalkType.UserDataForAdmin) {
   if (user.is_in_conf) {
     alert('暂不支持在线编辑配置文件中的用户，请手动修改配置文件')
     return
@@ -75,7 +75,7 @@ function editUser(user: UserDataForAdmin) {
   editingUser.value = user
 }
 
-function updateUser(user: UserDataForAdmin) {
+function updateUser(user: ArtalkType.UserDataForAdmin) {
   const index = users.value.findIndex(u => u.id === user.id)
   if (index != -1) {
     // 修改用户
@@ -97,7 +97,7 @@ function closeEditUser() {
   editingUser.value = undefined
 }
 
-function delUser(user: UserDataForAdmin) {
+function delUser(user: ArtalkType.UserDataForAdmin) {
   if (window.confirm(`该操作将删除 用户："${user.name}" 邮箱："${user.email}" 所有评论，包括其评论下面他人的回复评论，是否继续？`)) {
     artalk!.ctx.getApi().user.userDel(user.id)
       .then(() => {
diff --git a/ui/packages/artalk-sidebar/src/stores/nav.ts b/ui/packages/artalk-sidebar/src/stores/nav.ts
index 65adbd964..17fbb2880 100644
--- a/ui/packages/artalk-sidebar/src/stores/nav.ts
+++ b/ui/packages/artalk-sidebar/src/stores/nav.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { artalk } from '../global'
-import type { SiteData } from 'artalk/types/artalk-data'
+import type { ArtalkType } from 'artalk'
 
 type TabsObj = {[name: string]: string}
 
@@ -9,7 +9,7 @@ export const useNavStore = defineStore('nav', () => {
   const tabs = ref<TabsObj>({})
 
   const curtPage = ref('comments')
-  const sites = ref<SiteData[]>([])
+  const sites = ref<ArtalkType.SiteData[]>([])
   const siteSwitcherShow = ref(false)
 
   const isSearchEnabled = ref(false)
diff --git a/ui/packages/artalk/package.json b/ui/packages/artalk/package.json
index 4b7d06701..0d2283d2e 100644
--- a/ui/packages/artalk/package.json
+++ b/ui/packages/artalk/package.json
@@ -22,6 +22,7 @@
   "jsdelivr": "./dist/Artalk.iife.js",
   "module": "./dist/Artalk.es.js",
   "types": "./dist/src/main.d.ts",
+  "typings": "./dist/src/main.d.ts",
   "scripts": {
     "dev": "vite",
     "build": "vite build && pnpm build:lite && pnpm build:i18n",
diff --git a/ui/packages/artalk/src/api/api-base.ts b/ui/packages/artalk/src/api/api-base.ts
index a0fcceb57..475a652c5 100644
--- a/ui/packages/artalk/src/api/api-base.ts
+++ b/ui/packages/artalk/src/api/api-base.ts
@@ -1,12 +1,12 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import Api from '.'
 import { POST, Fetch } from './request'
 
 abstract class ApiBase {
   protected api: Api
-  protected ctx: Context
+  protected ctx: ContextApi
 
-  constructor(api: Api, ctx: Context) {
+  constructor(api: Api, ctx: ContextApi) {
     this.api = api
     this.ctx = ctx
   }
diff --git a/ui/packages/artalk/src/api/comment.ts b/ui/packages/artalk/src/api/comment.ts
index 22b9948ba..17da5e404 100644
--- a/ui/packages/artalk/src/api/comment.ts
+++ b/ui/packages/artalk/src/api/comment.ts
@@ -1,4 +1,4 @@
-import { CommentData, ListData } from '~/types/artalk-data'
+import type { CommentData, ListData } from '~/types'
 import * as Utils from '../lib/utils'
 import ApiBase from './api-base'
 import User from '../lib/user'
diff --git a/ui/packages/artalk/src/api/index.ts b/ui/packages/artalk/src/api/index.ts
index d4235b10a..904eb9d30 100644
--- a/ui/packages/artalk/src/api/index.ts
+++ b/ui/packages/artalk/src/api/index.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import 'abortcontroller-polyfill/dist/polyfill-patch-fetch'
 
 import comment from './comment'
@@ -17,12 +17,12 @@ const ApiComponents = {
 }
 
 class Api {
-  protected ctx: Context
+  protected ctx: ContextApi
   public get baseURL() {
     return `${this.ctx.conf.server}/api`
   }
 
-  constructor (ctx: Context) {
+  constructor (ctx: ContextApi) {
     this.ctx = ctx
 
     Object.entries(ApiComponents).forEach(([key, ApiComponent]) => {
diff --git a/ui/packages/artalk/src/api/page.ts b/ui/packages/artalk/src/api/page.ts
index 3ef178b52..aacf82fdc 100644
--- a/ui/packages/artalk/src/api/page.ts
+++ b/ui/packages/artalk/src/api/page.ts
@@ -1,4 +1,4 @@
-import { PageData, CommentData } from '~/types/artalk-data'
+import type { PageData, CommentData } from '~/types'
 import ApiBase from './api-base'
 
 /**
diff --git a/ui/packages/artalk/src/api/request.ts b/ui/packages/artalk/src/api/request.ts
index 151ba42f3..b45896f56 100644
--- a/ui/packages/artalk/src/api/request.ts
+++ b/ui/packages/artalk/src/api/request.ts
@@ -1,9 +1,9 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import User from '../lib/user'
 import $t from '../i18n'
 
 /** 公共请求函数 */
-export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit, timeout?: number): Promise<any> {
+export async function Fetch(ctx: ContextApi, input: RequestInfo, init: RequestInit, timeout?: number): Promise<any> {
   // JWT
   if (User.data.token) {
     const headers = new Headers(init.headers) // 保留原有 headers
@@ -61,7 +61,7 @@ export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit,
 }
 
 /** 公共 POST 请求 */
-export async function POST<T>(ctx: Context, url: string, data?: {[key: string]: any}) {
+export async function POST<T>(ctx: ContextApi, url: string, data?: {[key: string]: any}) {
   const init: RequestInit = {
     method: 'POST',
   }
@@ -88,7 +88,7 @@ export function ToFormData(object: {[key: string]: any}): FormData {
 }
 
 /** 我靠，fetch 一个 timeout，都要丑陋的实现 */
-function timeoutFetch(ctx: Context, url: RequestInfo, ms: number, opts: RequestInit) {
+function timeoutFetch(ctx: ContextApi, url: RequestInfo, ms: number, opts: RequestInit) {
   const controller = new AbortController()
   opts.signal?.addEventListener('abort', () => controller.abort()) // 保留原有 signal 功能
   let promise = fetch(url, { ...opts, signal: controller.signal })
diff --git a/ui/packages/artalk/src/api/site.ts b/ui/packages/artalk/src/api/site.ts
index 4aee86c3f..46ba8f1d4 100644
--- a/ui/packages/artalk/src/api/site.ts
+++ b/ui/packages/artalk/src/api/site.ts
@@ -1,4 +1,4 @@
-import { SiteData } from '~/types/artalk-data'
+import type { SiteData } from '~/types'
 import ApiBase from './api-base'
 
 /**
diff --git a/ui/packages/artalk/src/api/system.ts b/ui/packages/artalk/src/api/system.ts
index 561e1ca71..b46934b28 100644
--- a/ui/packages/artalk/src/api/system.ts
+++ b/ui/packages/artalk/src/api/system.ts
@@ -1,4 +1,4 @@
-import ArtalkConfig from '~/types/artalk-config'
+import type { ArtalkConfig } from '~/types'
 import ApiBase from './api-base'
 
 interface ApiVersionInfo {
diff --git a/ui/packages/artalk/src/api/user.ts b/ui/packages/artalk/src/api/user.ts
index 4846c66db..cd3a91228 100644
--- a/ui/packages/artalk/src/api/user.ts
+++ b/ui/packages/artalk/src/api/user.ts
@@ -1,4 +1,4 @@
-import { UserData, NotifyData, UserDataForAdmin } from '~/types/artalk-data'
+import type { UserData, NotifyData, UserDataForAdmin } from '~/types'
 import ApiBase from './api-base'
 import { ToFormData } from './request'
 import User from '../lib/user'
diff --git a/ui/packages/artalk/src/artalk.ts b/ui/packages/artalk/src/artalk.ts
index 6bf512d9a..989b7a310 100644
--- a/ui/packages/artalk/src/artalk.ts
+++ b/ui/packages/artalk/src/artalk.ts
@@ -1,9 +1,6 @@
 import './style/main.scss'
 
-import type ArtalkConfig from '~/types/artalk-config'
-import type { EventPayloadMap } from '~/types/event'
-import type ArtalkPlugin from '~/types/plugin'
-import type Context from '~/types/context'
+import type { ArtalkConfig, EventPayloadMap, ArtalkPlugin, ContextApi } from '~/types'
 import type { EventHandler } from './lib/event-manager'
 import ConcreteContext from './context'
 import defaults from './defaults'
@@ -11,7 +8,6 @@ import { handelBaseConf } from './config'
 import Services from './service'
 import { DefaultPlugins } from './plugins'
 import * as Stat from './plugins/stat'
-import List from './list/list'
 import Api from './api'
 
 /**
@@ -22,11 +18,10 @@ import Api from './api'
 export default class Artalk {
   private static instance?: Artalk
 
-  public static List = List
   public static readonly defaults: ArtalkConfig = defaults
 
   public conf!: ArtalkConfig
-  public ctx!: Context
+  public ctx!: ContextApi
   public $root!: HTMLElement
 
   /** Plugins */
@@ -161,7 +156,7 @@ export default class Artalk {
 
   /** Load count widget */
   public static loadCountWidget(conf: Partial<ArtalkConfig>) {
-    const ctx: Context = new ConcreteContext(handelBaseConf(conf))
+    const ctx: ContextApi = new ConcreteContext(handelBaseConf(conf))
     ctx.inject('api', new Api(ctx))
     Stat.initCountWidget({ ctx, pvAdd: false })
   }
diff --git a/ui/packages/artalk/src/comment/comment.ts b/ui/packages/artalk/src/comment/comment.ts
index 74cfcfe31..1952a1f1e 100644
--- a/ui/packages/artalk/src/comment/comment.ts
+++ b/ui/packages/artalk/src/comment/comment.ts
@@ -1,5 +1,4 @@
-import { CommentData } from '~/types/artalk-data'
-import Context from '~/types/context'
+import type { CommentData, ContextApi } from '~/types'
 import Component from '../lib/component'
 import * as Utils from '../lib/utils'
 import marked from '../lib/marked'
@@ -31,7 +30,7 @@ export default class Comment extends Component {
   private nestCurt: number // 当前嵌套层数
   private nestMax: number  // 最大嵌套层数
 
-  constructor(ctx: Context, data: CommentData, conf: CommentConf) {
+  constructor(ctx: ContextApi, data: CommentData, conf: CommentConf) {
     super(ctx)
 
     // 最大嵌套数
diff --git a/ui/packages/artalk/src/components/action-btn.ts b/ui/packages/artalk/src/components/action-btn.ts
index 145666c48..801fbe590 100644
--- a/ui/packages/artalk/src/components/action-btn.ts
+++ b/ui/packages/artalk/src/components/action-btn.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import * as Utils from '../lib/utils'
 
 interface ActionBtnConf {
@@ -19,7 +19,7 @@ interface ActionBtnConf {
  * 通用操作按钮
  */
 export default class ActionBtn {
-  private ctx: Context
+  private ctx: ContextApi
   private conf: ActionBtnConf
   public $el: HTMLElement
 
@@ -33,7 +33,7 @@ export default class ActionBtn {
   public confirmRecTimer?: number // 确认消息复原定时器
 
   /** 构造函数 */
-  constructor(ctx: Context, conf: ActionBtnConf|string|(() => string)) {
+  constructor(ctx: ContextApi, conf: ActionBtnConf|string|(() => string)) {
     this.ctx = ctx
     this.$el = Utils.createElement(`<span class="atk-common-action-btn"></span>`)
 
diff --git a/ui/packages/artalk/src/components/dialog.ts b/ui/packages/artalk/src/components/dialog.ts
index a54544d8e..00f22f78d 100644
--- a/ui/packages/artalk/src/components/dialog.ts
+++ b/ui/packages/artalk/src/components/dialog.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import * as Utils from '../lib/utils'
 
 type BtnClickHandler = (btnEl: HTMLElement, dialog: Dialog) => boolean|void
@@ -7,12 +7,12 @@ type BtnClickHandler = (btnEl: HTMLElement, dialog: Dialog) => boolean|void
  * 对话框
  */
 export default class Dialog {
-  public ctx: Context
+  public ctx: ContextApi
   public $el: HTMLElement
   public $content: HTMLElement
   public $actions: HTMLElement
 
-  constructor (ctx: Context, contentEl: HTMLElement) {
+  constructor (ctx: ContextApi, contentEl: HTMLElement) {
     this.ctx = ctx
 
     this.$el = Utils.createElement(
diff --git a/ui/packages/artalk/src/config.ts b/ui/packages/artalk/src/config.ts
index b77a955fa..1f3856d56 100644
--- a/ui/packages/artalk/src/config.ts
+++ b/ui/packages/artalk/src/config.ts
@@ -1,4 +1,4 @@
-import type ArtalkConfig from '~/types/artalk-config'
+import type { ArtalkConfig } from '~/types'
 import * as Utils from './lib/utils'
 import Defaults from './defaults'
 
diff --git a/ui/packages/artalk/src/context.ts b/ui/packages/artalk/src/context.ts
index 79ce74030..7067d29e4 100644
--- a/ui/packages/artalk/src/context.ts
+++ b/ui/packages/artalk/src/context.ts
@@ -1,7 +1,4 @@
-import type ArtalkConfig from '~/types/artalk-config'
-import type { CommentData, ListFetchParams } from '~/types/artalk-data'
-import type { EventPayloadMap } from '~/types/event'
-import type ContextApi from '~/types/context'
+import type { ArtalkConfig, CommentData, ListFetchParams, ContextApi, EventPayloadMap } from '~/types'
 import type { TInjectedServices } from './service'
 
 import * as Utils from './lib/utils'
diff --git a/ui/packages/artalk/src/data.ts b/ui/packages/artalk/src/data.ts
index 6cb29d91c..df3b2f9c1 100644
--- a/ui/packages/artalk/src/data.ts
+++ b/ui/packages/artalk/src/data.ts
@@ -1,5 +1,4 @@
-import type { NotifyData, PageData, CommentData, DataManagerApi, ListFetchParams, ListLastFetchData } from '~/types/artalk-data'
-import type { EventPayloadMap } from '~/types/event'
+import type { NotifyData, PageData, CommentData, DataManagerApi, ListFetchParams, ListLastFetchData, EventPayloadMap } from '~/types'
 import EventManager from './lib/event-manager'
 
 export class DataManager implements DataManagerApi {
diff --git a/ui/packages/artalk/src/defaults.ts b/ui/packages/artalk/src/defaults.ts
index a49f0e89d..955eb2a35 100644
--- a/ui/packages/artalk/src/defaults.ts
+++ b/ui/packages/artalk/src/defaults.ts
@@ -1,4 +1,4 @@
-import ArtalkConfig from "~/types/artalk-config"
+import type { ArtalkConfig } from '~/types'
 
 const defaults: ArtalkConfig = {
   el: '',
diff --git a/ui/packages/artalk/src/editor/editor.ts b/ui/packages/artalk/src/editor/editor.ts
index da7d1672c..e1e748750 100644
--- a/ui/packages/artalk/src/editor/editor.ts
+++ b/ui/packages/artalk/src/editor/editor.ts
@@ -1,6 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
-import type { EditorApi, EditorState } from '~/types/editor'
-import type Context from '~/types/context'
+import type { CommentData, ContextApi, EditorApi } from '~/types'
 import Component from '../lib/component'
 import * as Ui from '../lib/ui'
 import marked from '../lib/marked'
@@ -15,7 +13,7 @@ class Editor extends Component implements EditorApi {
   getPlugs() { return this.ctx.get('editorPlugs') }
   getState() { return this.state.get() }
 
-  constructor(ctx: Context) {
+  constructor(ctx: ContextApi) {
     super(ctx)
 
     // init editor ui
diff --git a/ui/packages/artalk/src/editor/state.ts b/ui/packages/artalk/src/editor/state.ts
index 757f09151..ce2514c05 100644
--- a/ui/packages/artalk/src/editor/state.ts
+++ b/ui/packages/artalk/src/editor/state.ts
@@ -1,5 +1,4 @@
-import type { EditorState } from '~/types/editor'
-import type { CommentData } from '~/types/artalk-data'
+import type { EditorState, CommentData } from '~/types'
 import * as Ui from '@/lib/ui'
 import type Editor from './editor'
 import Mover from '../plugins/editor/mover'
diff --git a/ui/packages/artalk/src/layer/layer.ts b/ui/packages/artalk/src/layer/layer.ts
index 02de9b8d5..1c824ecf3 100644
--- a/ui/packages/artalk/src/layer/layer.ts
+++ b/ui/packages/artalk/src/layer/layer.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import Component from '../lib/component'
 import * as Utils from '../lib/utils'
 import * as Ui from '../lib/ui'
@@ -15,7 +15,7 @@ export default class Layer extends Component {
 
   public afterHide?: Function
 
-  constructor (ctx: Context, name: string, el?: HTMLElement) {
+  constructor (ctx: ContextApi, name: string, el?: HTMLElement) {
     super(ctx)
 
     this.name = name
diff --git a/ui/packages/artalk/src/layer/sidebar-layer.ts b/ui/packages/artalk/src/layer/sidebar-layer.ts
index 8aba87ec4..4d004e331 100644
--- a/ui/packages/artalk/src/layer/sidebar-layer.ts
+++ b/ui/packages/artalk/src/layer/sidebar-layer.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import Component from '@/lib/component'
 import * as Utils from '@/lib/utils'
 import * as Ui from '@/lib/ui'
@@ -17,7 +17,7 @@ export default class SidebarLayer extends Component {
   public $iframeWrap: HTMLElement
   public $iframe?: HTMLIFrameElement
 
-  constructor(ctx: Context) {
+  constructor(ctx: ContextApi) {
     super(ctx)
 
     this.$el = Utils.createElement(SidebarHTML)
diff --git a/ui/packages/artalk/src/lib/checker/index.ts b/ui/packages/artalk/src/lib/checker/index.ts
index 039bb5f79..944ae420b 100644
--- a/ui/packages/artalk/src/lib/checker/index.ts
+++ b/ui/packages/artalk/src/lib/checker/index.ts
@@ -1,11 +1,10 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import Dialog from '@/components/dialog'
 import Layer from '@/layer'
 import * as Utils from '../utils'
 import CaptchaChecker from './captcha'
 import AdminChecker from './admin'
 import type Api from '../../api'
-import type User from '../user'
 
 export interface CheckerCaptchaPayload extends CheckerPayload {
   imgData?: string
@@ -22,10 +21,10 @@ export interface CheckerPayload {
  * Checker 发射台
  */
 export default class CheckerLauncher {
-  public ctx: Context
+  public ctx: ContextApi
   public launched: Checker[] = []
 
-  constructor(ctx: Context) {
+  constructor(ctx: ContextApi) {
     this.ctx = ctx
   }
 
@@ -188,7 +187,7 @@ interface CheckerStore {
 export interface CheckerCtx {
   get<K extends keyof CheckerStore>(key: K): CheckerStore[K]
   set<K extends keyof CheckerStore>(key: K, val: CheckerStore[K]): void
-  getCtx(): Context
+  getCtx(): ContextApi
   getApi(): Api
   getLayer(): Layer
   hideInteractInput(): void
diff --git a/ui/packages/artalk/src/lib/component.ts b/ui/packages/artalk/src/lib/component.ts
index 9231979bf..641508b4d 100644
--- a/ui/packages/artalk/src/lib/component.ts
+++ b/ui/packages/artalk/src/lib/component.ts
@@ -1,14 +1,13 @@
-import ArtalkConfig from '~/types/artalk-config'
-import Context from '~/types/context'
+import type { ArtalkConfig, ContextApi } from '~/types'
 import { I18n } from '../i18n'
 
 export default abstract class Component {
   public $el!: HTMLElement
 
-  public ctx: Context
+  public ctx: ContextApi
   public readonly conf: ArtalkConfig
 
-  public constructor(ctx: Context) {
+  public constructor(ctx: ContextApi) {
     this.ctx = ctx
     this.conf = ctx.conf
   }
diff --git a/ui/packages/artalk/src/lib/dark-mode.ts b/ui/packages/artalk/src/lib/dark-mode.ts
index 408bebdac..2aebc3aa9 100644
--- a/ui/packages/artalk/src/lib/dark-mode.ts
+++ b/ui/packages/artalk/src/lib/dark-mode.ts
@@ -1,14 +1,14 @@
-import type Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import { getLayerWrap } from '../layer'
 
 const darkModeMedia = window.matchMedia('(prefers-color-scheme: dark)')
 let darkModeAutoFunc: (evt: MediaQueryListEvent) => void
 
-export function syncDarkModeConf(ctx: Context) {
+export function syncDarkModeConf(ctx: ContextApi) {
   setDarkMode(ctx, ctx.conf.darkMode, false) // ref `conf.darkMode` data, so no need to `alterConf`
 }
 
-export function setDarkMode(ctx: Context, darkMode: boolean|'auto', alterConf = true) {
+export function setDarkMode(ctx: ContextApi, darkMode: boolean|'auto', alterConf = true) {
   const apply = (d: boolean) => {
     updateClassName(ctx, d)
     if (alterConf) alterCtxConf(ctx, d)
@@ -30,12 +30,12 @@ export function setDarkMode(ctx: Context, darkMode: boolean|'auto', alterConf =
   }
 }
 
-function alterCtxConf(ctx: Context, darkMode: boolean) {
+function alterCtxConf(ctx: ContextApi, darkMode: boolean) {
   ctx.conf.darkMode = darkMode
 }
 
 const DarkModeClassName = 'atk-dark-mode'
-export function updateClassName(ctx: Context, darkMode: boolean) {
+export function updateClassName(ctx: ContextApi, darkMode: boolean) {
   if (darkMode) ctx.$root.classList.add(DarkModeClassName)
   else ctx.$root.classList.remove(DarkModeClassName)
 
diff --git a/ui/packages/artalk/src/lib/user.ts b/ui/packages/artalk/src/lib/user.ts
index e106c7fab..6eaec7c03 100644
--- a/ui/packages/artalk/src/lib/user.ts
+++ b/ui/packages/artalk/src/lib/user.ts
@@ -1,8 +1,7 @@
-import { LocalUser } from "~/types/artalk-config"
-import Context from '~/types/context'
+import type { LocalUser, ContextApi } from '~/types'
 
 class User {
-  public ctx?: Context
+  public ctx?: ContextApi
   public data: LocalUser
 
   public constructor() {
@@ -17,7 +16,7 @@ class User {
     }
   }
 
-  public setContext(ctx: Context) {
+  public setContext(ctx: ContextApi) {
     this.ctx = ctx
   }
 
diff --git a/ui/packages/artalk/src/lib/utils.ts b/ui/packages/artalk/src/lib/utils.ts
index e1b87afc3..8fbfa5cba 100644
--- a/ui/packages/artalk/src/lib/utils.ts
+++ b/ui/packages/artalk/src/lib/utils.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 
 export function createElement<E extends HTMLElement = HTMLElement>(htmlStr: string = ''): E {
   const div = document.createElement('div')
@@ -55,7 +55,7 @@ export function dateFormat(date: Date) {
   return `${vYear}-${vMonth}-${vDay}`
 }
 
-export function timeAgo(date: Date, ctx: Context) {
+export function timeAgo(date: Date, ctx: ContextApi) {
   try {
     const oldTime = date.getTime()
     const currTime = new Date().getTime()
@@ -115,7 +115,7 @@ export function onImagesLoaded($container: HTMLElement, event: Function) {
   }
 }
 
-export function getGravatarURL(ctx: Context, emailMD5: string) {
+export function getGravatarURL(ctx: ContextApi, emailMD5: string) {
   const { mirror, params } = ctx.conf.gravatar
   return `${mirror.replace(/\/$/, '')}/${emailMD5}?${params.replace(/^\?/, '')}`
 }
@@ -185,7 +185,7 @@ export function isValidURL(urlRaw: string) {
 }
 
 /** 获取基于 conf.server 的 URL */
-export function getURLBasedOnApi(ctx: Context, path: string) {
+export function getURLBasedOnApi(ctx: ContextApi, path: string) {
   return getURLBasedOn(ctx.conf.server, path)
 }
 
diff --git a/ui/packages/artalk/src/list/comment.ts b/ui/packages/artalk/src/list/comment.ts
index 27e86bd28..04d245146 100644
--- a/ui/packages/artalk/src/list/comment.ts
+++ b/ui/packages/artalk/src/list/comment.ts
@@ -1,8 +1,7 @@
-import { CommentData } from '~/types/artalk-data'
-import Context from '~/types/context'
+import type { ContextApi, CommentData } from '~/types'
 import Comment from '../comment/comment'
 
-export function createComment(ctx: Context, comment: CommentData, ctxComments: CommentData[]): Comment {
+export function createComment(ctx: ContextApi, comment: CommentData, ctxComments: CommentData[]): Comment {
   const instance = new Comment(ctx, comment, {
     isFlatMode: ctx.getData().getListLastFetch()?.params.flatMode!,
     afterRender: () => {
diff --git a/ui/packages/artalk/src/list/layout.ts b/ui/packages/artalk/src/list/layout.ts
index be566b96d..c356b801b 100644
--- a/ui/packages/artalk/src/list/layout.ts
+++ b/ui/packages/artalk/src/list/layout.ts
@@ -1,4 +1,4 @@
-import type { CommentData, ListData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 import * as Ui from '@/lib/ui'
 import Comment from '../comment/comment'
 import * as ListNest from './nest'
diff --git a/ui/packages/artalk/src/list/list.ts b/ui/packages/artalk/src/list/list.ts
index fb4a89ec2..6c6a1dc9c 100644
--- a/ui/packages/artalk/src/list/list.ts
+++ b/ui/packages/artalk/src/list/list.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import Component from '../lib/component'
 import * as Utils from '../lib/utils'
 import CommentNode from '../comment/comment'
@@ -16,7 +16,7 @@ export default class List extends Component {
   getCommentNodes() { return this.commentNodes }
 
   // TODO remove options and use ctx.conf instead
-  constructor (ctx: Context) {
+  constructor (ctx: ContextApi) {
     super(ctx)
 
     // Init base element
diff --git a/ui/packages/artalk/src/list/nest.ts b/ui/packages/artalk/src/list/nest.ts
index 5327754e8..e549dd181 100644
--- a/ui/packages/artalk/src/list/nest.ts
+++ b/ui/packages/artalk/src/list/nest.ts
@@ -1,4 +1,4 @@
-import { CommentData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 
 export type CommentNode = {
   id: number
diff --git a/ui/packages/artalk/src/list/page.ts b/ui/packages/artalk/src/list/page.ts
index 6d11951cb..e748a27ae 100644
--- a/ui/packages/artalk/src/list/page.ts
+++ b/ui/packages/artalk/src/list/page.ts
@@ -1,5 +1,4 @@
-import ArtalkConfig from '~/types/artalk-config'
-import type ContextApi from '~/types/context'
+import type { ArtalkConfig, ContextApi } from '~/types'
 import $t from '@/i18n'
 import { Paginator } from './paginator'
 import ReadMorePaginator from './paginator/read-more'
diff --git a/ui/packages/artalk/src/list/paginator/index.ts b/ui/packages/artalk/src/list/paginator/index.ts
index 75dcee918..13e83bfe4 100644
--- a/ui/packages/artalk/src/list/paginator/index.ts
+++ b/ui/packages/artalk/src/list/paginator/index.ts
@@ -1,5 +1,4 @@
-import type ContextApi from '~/types/context'
-import type { ListFetchParams } from '~/types/artalk-data'
+import type { ContextApi, ListFetchParams } from '~/types'
 import UpDownPaginator from './up-down'
 import ReadMorePaginator from './read-more'
 
diff --git a/ui/packages/artalk/src/list/paginator/read-more.ts b/ui/packages/artalk/src/list/paginator/read-more.ts
index 4239c1538..b1c6d0045 100644
--- a/ui/packages/artalk/src/list/paginator/read-more.ts
+++ b/ui/packages/artalk/src/list/paginator/read-more.ts
@@ -1,4 +1,4 @@
-import type { ListFetchParams } from '~/types/artalk-data'
+import type { ListFetchParams } from '~/types'
 import ReadMoreBtn from '@/components/read-more-btn'
 import $t from '@/i18n'
 import { Paginator, IPgHolderOpt } from '.'
diff --git a/ui/packages/artalk/src/main.ts b/ui/packages/artalk/src/main.ts
index 93bd7bd98..a46b7e7f0 100644
--- a/ui/packages/artalk/src/main.ts
+++ b/ui/packages/artalk/src/main.ts
@@ -1,3 +1,5 @@
 import Artalk from './artalk'
+import * as ArtalkType from '../types'
 
+export { ArtalkType }
 export default Artalk
diff --git a/ui/packages/artalk/src/plugins/conf-remoter.ts b/ui/packages/artalk/src/plugins/conf-remoter.ts
index 09c6691c1..cd1d59478 100644
--- a/ui/packages/artalk/src/plugins/conf-remoter.ts
+++ b/ui/packages/artalk/src/plugins/conf-remoter.ts
@@ -1,5 +1,4 @@
-import type ArtalkConfig from '~/types/artalk-config'
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkConfig, ArtalkPlugin } from '~/types'
 import { handleBackendRefConf } from '@/config'
 
 export const ConfRemoter: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/editor-kit.ts b/ui/packages/artalk/src/plugins/editor-kit.ts
index 8bc4fb74d..8ad5efa8b 100644
--- a/ui/packages/artalk/src/plugins/editor-kit.ts
+++ b/ui/packages/artalk/src/plugins/editor-kit.ts
@@ -1,5 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
-import type { EditorApi } from '~/types/editor'
+import type { EditorApi, ArtalkPlugin } from '~/types'
 import EventManager from '@/lib/event-manager'
 import { ENABLED_PLUGS, getDisabledPlugByConf } from './editor'
 import EditorPlug from './editor/_plug'
diff --git a/ui/packages/artalk/src/plugins/editor/_plug.ts b/ui/packages/artalk/src/plugins/editor/_plug.ts
index 9f6e0be94..d67b6514b 100644
--- a/ui/packages/artalk/src/plugins/editor/_plug.ts
+++ b/ui/packages/artalk/src/plugins/editor/_plug.ts
@@ -1,5 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
-import type { EditorState } from '~/types/editor'
+import type { CommentData, EditorState } from '~/types'
 import * as Utils from '@/lib/utils'
 import PlugKit from './_kit'
 
diff --git a/ui/packages/artalk/src/plugins/editor/emoticons.ts b/ui/packages/artalk/src/plugins/editor/emoticons.ts
index 2eb92acd8..97b4c0deb 100644
--- a/ui/packages/artalk/src/plugins/editor/emoticons.ts
+++ b/ui/packages/artalk/src/plugins/editor/emoticons.ts
@@ -1,6 +1,6 @@
 import './emoticons.scss'
 
-import { EmoticonListData, EmoticonGrpData } from '~/types/artalk-data'
+import type { EmoticonListData, EmoticonGrpData } from '~/types'
 import * as Utils from '@/lib/utils'
 import * as Ui from '@/lib/ui'
 import $t from '@/i18n'
diff --git a/ui/packages/artalk/src/plugins/editor/index.ts b/ui/packages/artalk/src/plugins/editor/index.ts
index 011efe0f1..1dfdab63c 100644
--- a/ui/packages/artalk/src/plugins/editor/index.ts
+++ b/ui/packages/artalk/src/plugins/editor/index.ts
@@ -1,4 +1,4 @@
-import type ArtalkConfig from '~/types/artalk-config'
+import type { ArtalkConfig } from '~/types'
 import EditorPlug from './_plug'
 import LocalStorage from './local-storage'
 import Textarea from './textarea'
diff --git a/ui/packages/artalk/src/plugins/editor/state-edit.ts b/ui/packages/artalk/src/plugins/editor/state-edit.ts
index ee8eb31e5..eb11b4d7c 100644
--- a/ui/packages/artalk/src/plugins/editor/state-edit.ts
+++ b/ui/packages/artalk/src/plugins/editor/state-edit.ts
@@ -1,4 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 import $t from '@/i18n'
 import * as Utils from '@/lib/utils'
 import User from '@/lib/user'
diff --git a/ui/packages/artalk/src/plugins/editor/state-reply.ts b/ui/packages/artalk/src/plugins/editor/state-reply.ts
index 09109d694..e2678b2ed 100644
--- a/ui/packages/artalk/src/plugins/editor/state-reply.ts
+++ b/ui/packages/artalk/src/plugins/editor/state-reply.ts
@@ -1,4 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 import * as Utils from '@/lib/utils'
 import * as Ui from '@/lib/ui'
 import $t from '@/i18n'
diff --git a/ui/packages/artalk/src/plugins/editor/submit-add.ts b/ui/packages/artalk/src/plugins/editor/submit-add.ts
index 122f1a760..9ef9bc5c8 100644
--- a/ui/packages/artalk/src/plugins/editor/submit-add.ts
+++ b/ui/packages/artalk/src/plugins/editor/submit-add.ts
@@ -1,4 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 import User from '@/lib/user'
 import PlugKit from './_kit'
 
diff --git a/ui/packages/artalk/src/plugins/editor/submit.ts b/ui/packages/artalk/src/plugins/editor/submit.ts
index 8a42283f5..4614c564e 100644
--- a/ui/packages/artalk/src/plugins/editor/submit.ts
+++ b/ui/packages/artalk/src/plugins/editor/submit.ts
@@ -1,4 +1,4 @@
-import type { CommentData } from '~/types/artalk-data'
+import type { CommentData } from '~/types'
 import $t from '@/i18n'
 import EditorPlug from './_plug'
 import PlugKit from './_kit'
diff --git a/ui/packages/artalk/src/plugins/index.ts b/ui/packages/artalk/src/plugins/index.ts
index a289365d8..935627bc3 100644
--- a/ui/packages/artalk/src/plugins/index.ts
+++ b/ui/packages/artalk/src/plugins/index.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import { ConfRemoter } from './conf-remoter'
 import { Markdown } from './markdown'
 import { EditorKit } from './editor-kit'
diff --git a/ui/packages/artalk/src/plugins/list/copyright.ts b/ui/packages/artalk/src/plugins/list/copyright.ts
index 859ea7d7c..24c0f671f 100644
--- a/ui/packages/artalk/src/plugins/list/copyright.ts
+++ b/ui/packages/artalk/src/plugins/list/copyright.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import { version as ARTALK_VERSION } from '~/package.json'
 
 export const Copyright: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/list/count.ts b/ui/packages/artalk/src/plugins/list/count.ts
index 2772d2657..b33d13c92 100644
--- a/ui/packages/artalk/src/plugins/list/count.ts
+++ b/ui/packages/artalk/src/plugins/list/count.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 import $t from '@/i18n'
 
diff --git a/ui/packages/artalk/src/plugins/list/dropdown.ts b/ui/packages/artalk/src/plugins/list/dropdown.ts
index 7f1ccfcf9..68164e444 100644
--- a/ui/packages/artalk/src/plugins/list/dropdown.ts
+++ b/ui/packages/artalk/src/plugins/list/dropdown.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 import $t from '@/i18n'
 
diff --git a/ui/packages/artalk/src/plugins/list/error-dialog.ts b/ui/packages/artalk/src/plugins/list/error-dialog.ts
index 02d3984e8..fc27af1be 100644
--- a/ui/packages/artalk/src/plugins/list/error-dialog.ts
+++ b/ui/packages/artalk/src/plugins/list/error-dialog.ts
@@ -1,5 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
-import ContextApi from '~/types/context'
+import type { ArtalkPlugin, ContextApi } from '~/types'
 import * as Utils from '../../lib/utils'
 import * as Ui from '../../lib/ui'
 import User from '../../lib/user'
diff --git a/ui/packages/artalk/src/plugins/list/fetch.ts b/ui/packages/artalk/src/plugins/list/fetch.ts
index a39e1b351..4ca95077e 100644
--- a/ui/packages/artalk/src/plugins/list/fetch.ts
+++ b/ui/packages/artalk/src/plugins/list/fetch.ts
@@ -1,5 +1,4 @@
-import type { ListFetchParams } from '~/types/artalk-data'
-import type ArtalkPlugin from '~/types/plugin'
+import type { ListFetchParams, ArtalkPlugin } from '~/types'
 
 export const Fetch: ArtalkPlugin = (ctx) => {
   ctx.on('list-fetch', (_params) => {
diff --git a/ui/packages/artalk/src/plugins/list/goto-first.ts b/ui/packages/artalk/src/plugins/list/goto-first.ts
index ba1d6a3e4..d93902504 100644
--- a/ui/packages/artalk/src/plugins/list/goto-first.ts
+++ b/ui/packages/artalk/src/plugins/list/goto-first.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 
 /** List scroll to the first comment */
diff --git a/ui/packages/artalk/src/plugins/list/goto.ts b/ui/packages/artalk/src/plugins/list/goto.ts
index 66db07034..0fb32f50f 100644
--- a/ui/packages/artalk/src/plugins/list/goto.ts
+++ b/ui/packages/artalk/src/plugins/list/goto.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 import * as Ui from '@/lib/ui'
 
diff --git a/ui/packages/artalk/src/plugins/list/index.ts b/ui/packages/artalk/src/plugins/list/index.ts
index 129287a00..d6daca95a 100644
--- a/ui/packages/artalk/src/plugins/list/index.ts
+++ b/ui/packages/artalk/src/plugins/list/index.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import { WithEditor } from './with-editor'
 import { Unread } from './unread'
 import { Count } from './count'
diff --git a/ui/packages/artalk/src/plugins/list/loading.ts b/ui/packages/artalk/src/plugins/list/loading.ts
index d6519c29f..20ef64edf 100644
--- a/ui/packages/artalk/src/plugins/list/loading.ts
+++ b/ui/packages/artalk/src/plugins/list/loading.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Ui from '@/lib/ui'
 
 export const Loading: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/list/no-comment.ts b/ui/packages/artalk/src/plugins/list/no-comment.ts
index ff9e67b5f..a3d246221 100644
--- a/ui/packages/artalk/src/plugins/list/no-comment.ts
+++ b/ui/packages/artalk/src/plugins/list/no-comment.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 
 export const NoComment: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/list/reach-bottom.ts b/ui/packages/artalk/src/plugins/list/reach-bottom.ts
index fc856451b..9a3174a85 100644
--- a/ui/packages/artalk/src/plugins/list/reach-bottom.ts
+++ b/ui/packages/artalk/src/plugins/list/reach-bottom.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 
 export const ReachBottom: ArtalkPlugin = (ctx) => {
   const scrollEvtAt = document.documentElement // TODO support ref ctx.conf
diff --git a/ui/packages/artalk/src/plugins/list/sidebar-btn.ts b/ui/packages/artalk/src/plugins/list/sidebar-btn.ts
index 9f4ea2ed3..12a881f53 100644
--- a/ui/packages/artalk/src/plugins/list/sidebar-btn.ts
+++ b/ui/packages/artalk/src/plugins/list/sidebar-btn.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import $t from '@/i18n'
 
 export const SidebarBtn: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/list/time-ticking.ts b/ui/packages/artalk/src/plugins/list/time-ticking.ts
index b027e8d3b..823b59c60 100644
--- a/ui/packages/artalk/src/plugins/list/time-ticking.ts
+++ b/ui/packages/artalk/src/plugins/list/time-ticking.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 
 /** 评论时间自动更新 */
diff --git a/ui/packages/artalk/src/plugins/list/unread-badge.ts b/ui/packages/artalk/src/plugins/list/unread-badge.ts
index 6c2f3000a..efcfc2656 100644
--- a/ui/packages/artalk/src/plugins/list/unread-badge.ts
+++ b/ui/packages/artalk/src/plugins/list/unread-badge.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 
 export const UnreadBadge: ArtalkPlugin = (ctx) => {
   let $unreadBadge: HTMLElement|null = null
diff --git a/ui/packages/artalk/src/plugins/list/unread.ts b/ui/packages/artalk/src/plugins/list/unread.ts
index c9a99506f..a6be13972 100644
--- a/ui/packages/artalk/src/plugins/list/unread.ts
+++ b/ui/packages/artalk/src/plugins/list/unread.ts
@@ -1,4 +1,4 @@
-import ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as Utils from '@/lib/utils'
 
 export const Unread: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/list/with-editor.ts b/ui/packages/artalk/src/plugins/list/with-editor.ts
index 0436fd9cc..63c5c453e 100644
--- a/ui/packages/artalk/src/plugins/list/with-editor.ts
+++ b/ui/packages/artalk/src/plugins/list/with-editor.ts
@@ -1,6 +1,4 @@
-import type ContextApi from '~/types/context'
-import type ArtalkPlugin from '~/types/plugin'
-import { PageData } from '~/types/artalk-data'
+import type { ContextApi, ArtalkPlugin, PageData } from '~/types'
 import $t from '@/i18n'
 
 function ensureListEditor(ctx: ContextApi) {
diff --git a/ui/packages/artalk/src/plugins/markdown.ts b/ui/packages/artalk/src/plugins/markdown.ts
index 7bbf7254b..4705485cf 100644
--- a/ui/packages/artalk/src/plugins/markdown.ts
+++ b/ui/packages/artalk/src/plugins/markdown.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import * as marked from '@/lib/marked'
 
 export const Markdown: ArtalkPlugin = (ctx) => {
diff --git a/ui/packages/artalk/src/plugins/stat.ts b/ui/packages/artalk/src/plugins/stat.ts
index d7e9de137..534c02c7e 100644
--- a/ui/packages/artalk/src/plugins/stat.ts
+++ b/ui/packages/artalk/src/plugins/stat.ts
@@ -1,5 +1,4 @@
-import ContextApi from '~/types/context'
-import ArtalkPlugin from '~/types/plugin'
+import type { ContextApi, ArtalkPlugin } from '~/types'
 
 export interface CountConf {
   ctx: ContextApi
diff --git a/ui/packages/artalk/src/plugins/version-check.ts b/ui/packages/artalk/src/plugins/version-check.ts
index 754066780..f0b07eef6 100644
--- a/ui/packages/artalk/src/plugins/version-check.ts
+++ b/ui/packages/artalk/src/plugins/version-check.ts
@@ -1,4 +1,4 @@
-import type ArtalkPlugin from '~/types/plugin'
+import type { ArtalkPlugin } from '~/types'
 import { version as ARTALK_VERSION } from '~/package.json'
 import type List from '~/src/list/list'
 import * as Ui from '@/lib/ui'
diff --git a/ui/packages/artalk/src/service.ts b/ui/packages/artalk/src/service.ts
index 676a7f673..9ad7d35b3 100644
--- a/ui/packages/artalk/src/service.ts
+++ b/ui/packages/artalk/src/service.ts
@@ -1,4 +1,4 @@
-import Context from '~/types/context'
+import type { ContextApi } from '~/types'
 import CheckerLauncher from './lib/checker'
 import Api from './api'
 import Editor from './editor/editor'
@@ -17,7 +17,7 @@ import { PlugManager } from './plugins/editor-kit'
  */
 const services = {
   // I18n
-  i18n(ctx: Context) {
+  i18n(ctx: ContextApi) {
     I18n.setLocale(ctx.conf.locale)
 
     ctx.on('conf-loaded', () => {
@@ -26,32 +26,32 @@ const services = {
   },
 
   // User Store
-  user(ctx: Context) {
+  user(ctx: ContextApi) {
     User.setContext(ctx)
     return User
   },
 
   // HTTP API client
-  api(ctx: Context) {
+  api(ctx: ContextApi) {
     const api = new Api(ctx)
     return api
   },
 
   // CheckerLauncher
-  checkerLauncher(ctx: Context) {
+  checkerLauncher(ctx: ContextApi) {
     const checkerLauncher = new CheckerLauncher(ctx)
     return checkerLauncher
   },
 
   // 编辑器
-  editor(ctx: Context) {
+  editor(ctx: ContextApi) {
     const editor = new Editor(ctx)
     ctx.$root.appendChild(editor.$el)
     return editor
   },
 
   // 评论列表
-  list(ctx: Context): List|undefined {
+  list(ctx: ContextApi): List|undefined {
     // 评论列表
     const list = new List(ctx)
     ctx.$root.appendChild(list.$el)
@@ -60,20 +60,20 @@ const services = {
   },
 
   // 弹出层
-  layer(ctx: Context) {
+  layer(ctx: ContextApi) {
     // 记录页面原始 CSS 属性
     Layer.BodyOrgOverflow = document.body.style.overflow
     Layer.BodyOrgPaddingRight = document.body.style.paddingRight
   },
 
   // 侧边栏 Layer
-  sidebarLayer(ctx: Context) {
+  sidebarLayer(ctx: ContextApi) {
     const sidebarLayer = new SidebarLayer(ctx)
     return sidebarLayer
   },
 
   // 默认事件绑定
-  eventsDefault(ctx: Context) {
+  eventsDefault(ctx: ContextApi) {
     // 本地用户数据变更
     ctx.on('user-changed', () => {
       ctx.checkAdminShowEl()
@@ -81,7 +81,7 @@ const services = {
   },
 
   // 夜间模式
-  darkMode(ctx: Context) {
+  darkMode(ctx: ContextApi) {
     DarkMode.syncDarkModeConf(ctx)
 
     ctx.on('conf-loaded', () => {
diff --git a/ui/packages/artalk/types/artalk-config.d.ts b/ui/packages/artalk/types/config.ts
similarity index 97%
rename from ui/packages/artalk/types/artalk-config.d.ts
rename to ui/packages/artalk/types/config.ts
index 89c2330eb..9bf947ad5 100644
--- a/ui/packages/artalk/types/artalk-config.d.ts
+++ b/ui/packages/artalk/types/config.ts
@@ -1,7 +1,7 @@
 import { I18n } from '~/src/i18n'
-import { CommentData } from './artalk-data'
+import { CommentData } from './data'
 
-export default interface ArtalkConfig {
+export interface ArtalkConfig {
   /** 装载元素 */
   el: string|HTMLElement
 
diff --git a/ui/packages/artalk/types/context.d.ts b/ui/packages/artalk/types/context.ts
similarity index 94%
rename from ui/packages/artalk/types/context.d.ts
rename to ui/packages/artalk/types/context.ts
index 1b707a97e..99d3f2b75 100644
--- a/ui/packages/artalk/types/context.d.ts
+++ b/ui/packages/artalk/types/context.ts
@@ -1,5 +1,5 @@
-import ArtalkConfig from './artalk-config'
-import { CommentData, DataManagerApi, ListFetchParams } from './artalk-data'
+import { ArtalkConfig } from './config'
+import { CommentData, DataManagerApi, ListFetchParams } from './data'
 import type { EventPayloadMap } from './event'
 import type { EventManagerFuncs } from '../src/lib/event-manager'
 import { I18n } from '../src/i18n'
@@ -14,7 +14,7 @@ import type { TInjectedServices } from '../src/service'
  *
  * (面向接口的编程)
  */
-export default interface ContextApi extends EventManagerFuncs<EventPayloadMap> {
+export interface ContextApi extends EventManagerFuncs<EventPayloadMap> {
   /** Artalk 根元素对象 */
   $root: HTMLElement
 
diff --git a/ui/packages/artalk/types/artalk-data.d.ts b/ui/packages/artalk/types/data.ts
similarity index 100%
rename from ui/packages/artalk/types/artalk-data.d.ts
rename to ui/packages/artalk/types/data.ts
diff --git a/ui/packages/artalk/types/editor.d.ts b/ui/packages/artalk/types/editor.ts
similarity index 97%
rename from ui/packages/artalk/types/editor.d.ts
rename to ui/packages/artalk/types/editor.ts
index 2f4387542..c4ad3ff68 100644
--- a/ui/packages/artalk/types/editor.d.ts
+++ b/ui/packages/artalk/types/editor.ts
@@ -1,4 +1,4 @@
-import type { CommentData } from './artalk-data'
+import type { CommentData } from './data'
 import Component from '../src/lib/component'
 import { EditorUI } from '../src/editor/ui'
 
diff --git a/ui/packages/artalk/types/event.d.ts b/ui/packages/artalk/types/event.ts
similarity index 95%
rename from ui/packages/artalk/types/event.d.ts
rename to ui/packages/artalk/types/event.ts
index 11f3bdda0..59e3fbd76 100644
--- a/ui/packages/artalk/types/event.d.ts
+++ b/ui/packages/artalk/types/event.ts
@@ -1,6 +1,6 @@
 import type Comment from '~/src/comment'
-import { CommentData, ListData, ListFetchParams, NotifyData, PageData } from './artalk-data'
-import ArtalkConfig, { LocalUser } from './artalk-config'
+import { CommentData, ListData, ListFetchParams, NotifyData, PageData } from './data'
+import { ArtalkConfig, LocalUser } from './config'
 
 interface ErrorData { msg: string, data?: any }
 interface ListFetchedArgs { params: Partial<ListFetchParams>, data?: ListData, error?: ErrorData }
diff --git a/ui/packages/artalk/types/index.ts b/ui/packages/artalk/types/index.ts
new file mode 100644
index 000000000..cd7f13f9e
--- /dev/null
+++ b/ui/packages/artalk/types/index.ts
@@ -0,0 +1,6 @@
+export * from './config'
+export * from './data'
+export * from './context'
+export * from './editor'
+export * from './event'
+export * from './plugin'
diff --git a/ui/packages/artalk/types/plugin.d.ts b/ui/packages/artalk/types/plugin.d.ts
deleted file mode 100644
index 4a97c8d0f..000000000
--- a/ui/packages/artalk/types/plugin.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ContextApi from './context'
-
-type ArtalkPlugin = (ctx: ContextApi) => void
-export default ArtalkPlugin
diff --git a/ui/packages/artalk/types/plugin.ts b/ui/packages/artalk/types/plugin.ts
new file mode 100644
index 000000000..e09a079d7
--- /dev/null
+++ b/ui/packages/artalk/types/plugin.ts
@@ -0,0 +1,3 @@
+import { ContextApi } from './context'
+
+export type ArtalkPlugin = (ctx: ContextApi) => void
diff --git a/ui/packages/artalk/vite.config.ts b/ui/packages/artalk/vite.config.ts
index f80a094e7..bb7566af6 100644
--- a/ui/packages/artalk/vite.config.ts
+++ b/ui/packages/artalk/vite.config.ts
@@ -18,6 +18,7 @@ export default Utils.mergeDeep(baseConf, defineConfig({
     rollupOptions: {
       output: {
         assetFileNames: (assetInfo) => (/\.css$/.test(assetInfo.name || '') ? "Artalk.css" : "[name].[ext]"),
+        exports: 'named'
       }
     }
   },