From 7e065208a9ab02f3caad55975482a8a063e5c98b Mon Sep 17 00:00:00 2001
From: pengzhanbo <volodymyr@foxmail.com>
Date: Sat, 15 Jun 2024 17:42:29 +0800
Subject: [PATCH] =?UTF-8?q?perf(theme):=20=E9=87=8D=E5=91=BD=E5=90=8D=20`a?=
 =?UTF-8?q?vatar`=20=E4=B8=BA=20`profile`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vuepress/theme.ts                       |  4 +-
 theme/src/client/components/Blog/VPBlog.vue   |  6 +--
 .../client/components/Blog/VPBlogAside.vue    |  2 +-
 .../client/components/Blog/VPBlogExtract.vue  | 46 +++++++++----------
 .../client/components/Blog/VPBlogProfile.vue  | 22 ++++-----
 .../client/components/Home/VPHomeProfile.vue  | 10 ++--
 .../src/client/components/VPEncryptGlobal.vue | 10 ++--
 theme/src/node/config/resolveThemeData.ts     | 12 ++++-
 theme/src/node/plugins/getPlugins.ts          |  2 +-
 .../plugins/resolveAutoFrontmatterOptions.ts  |  4 +-
 theme/src/shared/options/locale.ts            | 24 ++++++++--
 11 files changed, 83 insertions(+), 59 deletions(-)

diff --git a/docs/.vuepress/theme.ts b/docs/.vuepress/theme.ts
index 18a84dcb..c1592c5c 100644
--- a/docs/.vuepress/theme.ts
+++ b/docs/.vuepress/theme.ts
@@ -10,8 +10,8 @@ export const theme: Theme = themePlume({
   docsRepo: 'https://github.com/pengzhanbo/vuepress-theme-plume',
   docsDir: 'docs',
 
-  avatar: {
-    url: '/plume.png',
+  profile: {
+    avatar: '/plume.png',
     name: 'Plume Theme',
     description: 'The Theme for Vuepress 2.0',
     location: 'GuangZhou, China',
diff --git a/theme/src/client/components/Blog/VPBlog.vue b/theme/src/client/components/Blog/VPBlog.vue
index e6fdaadd..922adf6b 100644
--- a/theme/src/client/components/Blog/VPBlog.vue
+++ b/theme/src/client/components/Blog/VPBlog.vue
@@ -29,8 +29,8 @@ const type = computed(() => {
 
 <template>
   <div class="vp-blog">
-    <div class="blog-container" :class="{ 'no-avatar': !theme.avatar }">
-      <VPBlogNav v-if="!theme.avatar" is-local />
+    <div class="blog-container" :class="{ 'no-profile': !theme.profile }">
+      <VPBlogNav v-if="!theme.profile" is-local />
 
       <VPTransitionFadeSlideY>
         <component :is="com[type]" />
@@ -57,7 +57,7 @@ const type = computed(() => {
   margin: 0 auto;
 }
 
-.blog-container.no-avatar {
+.blog-container.no-profile {
   display: block;
   max-width: 784px;
   padding-right: 24px;
diff --git a/theme/src/client/components/Blog/VPBlogAside.vue b/theme/src/client/components/Blog/VPBlogAside.vue
index 2c2a85f1..04cd4129 100644
--- a/theme/src/client/components/Blog/VPBlogAside.vue
+++ b/theme/src/client/components/Blog/VPBlogAside.vue
@@ -7,7 +7,7 @@ const { theme } = useData()
 </script>
 
 <template>
-  <div v-if="theme.avatar" class="vp-blog-aside">
+  <div v-if="theme.profile" class="vp-blog-aside">
     <VPBlogProfile />
     <VPBlogNav />
   </div>
diff --git a/theme/src/client/components/Blog/VPBlogExtract.vue b/theme/src/client/components/Blog/VPBlogExtract.vue
index 85536ae2..b0f96b6f 100644
--- a/theme/src/client/components/Blog/VPBlogExtract.vue
+++ b/theme/src/client/components/Blog/VPBlogExtract.vue
@@ -11,9 +11,9 @@ import { inBrowser } from '../../utils/index.js'
 const { theme } = useData()
 const route = useRoute()
 
-const avatar = computed(() => theme.value.avatar)
+const profile = computed(() => theme.value.profile)
 const imageUrl = computed(() => {
-  const url = avatar.value?.url
+  const url = profile.value?.avatar ?? profile.value?.url
   if (!url)
     return ''
   if (isLinkHttp(url))
@@ -52,7 +52,7 @@ watch(
 )
 
 const showBlogExtract = computed(() => {
-  return avatar.value || hasBlogExtract.value
+  return profile.value || hasBlogExtract.value
 })
 </script>
 
@@ -64,28 +64,28 @@ const showBlogExtract = computed(() => {
     <Transition name="fade">
       <div v-show="open" class="blog-modal" @click.self="open = false">
         <div class="blog-modal-container" :class="{ open: lazyOpen }">
-          <div v-if="avatar" class="avatar-profile">
+          <div v-if="profile" class="profile">
             <p v-if="imageUrl" class="avatar">
-              <img :src="imageUrl" :alt="avatar.name">
+              <img :src="imageUrl" :alt="profile.name">
             </p>
             <div>
-              <h3>{{ avatar.name }}</h3>
+              <h3>{{ profile.name }}</h3>
               <p class="desc">
-                {{ avatar.description }}
+                {{ profile.description }}
               </p>
-              <div class="avatar-info">
-                <div v-if="avatar.location" class="avatar-location">
+              <div class="profile-info">
+                <div v-if="profile.location" class="profile-location">
                   <span class="vpi-location" />
-                  <p v-if="avatar.location" v-html="avatar.location" />
+                  <p v-if="profile.location" v-html="profile.location" />
                 </div>
-                <div v-if="avatar.organization" class="avatar-organization">
+                <div v-if="profile.organization" class="profile-organization">
                   <span class="vpi-organization" />
-                  <p v-if="avatar.organization" v-html="avatar.organization" />
+                  <p v-if="profile.organization" v-html="profile.organization" />
                 </div>
               </div>
             </div>
           </div>
-          <div v-if="hasBlogExtract" class="blog-nav" :class="{ 'no-avatar': !avatar }">
+          <div v-if="hasBlogExtract" class="blog-nav" :class="{ 'no-profile': !profile }">
             <VPLink class="nav-link" :href="tags.link" no-icon>
               <span class="vpi-tag icon" />
               <span>{{ tags.text }}</span>
@@ -185,21 +185,21 @@ const showBlogExtract = computed(() => {
   transform: translateY(0);
 }
 
-.avatar-profile {
+.profile {
   display: flex;
   align-items: center;
 }
 
-.avatar-profile .avatar {
+.profile .avatar {
   width: 64px;
   margin-right: 16px;
 }
 
-.avatar-profile h3 {
+.profile h3 {
   font-weight: 600;
 }
 
-.avatar-profile .desc {
+.profile .desc {
   font-size: 14px;
 }
 
@@ -212,7 +212,7 @@ const showBlogExtract = computed(() => {
   border-top: solid 1px var(--vp-c-divider);
 }
 
-.blog-nav.no-avatar {
+.blog-nav.no-profile {
   padding-top: 0;
   margin: 0;
   border-top: none;
@@ -234,15 +234,15 @@ const showBlogExtract = computed(() => {
   margin-right: 4px;
 }
 
-.avatar-info {
+.profile-info {
   display: flex;
   flex-wrap: wrap;
   gap: 0 20px;
   align-items: center;
 }
 
-.avatar-location,
-.avatar-organization {
+.profile-location,
+.profile-organization {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -251,8 +251,8 @@ const showBlogExtract = computed(() => {
   transition: color var(--t-color);
 }
 
-.avatar-location p,
-.avatar-organization p {
+.profile-location p,
+.profile-organization p {
   margin: 0 4px;
 }
 </style>
diff --git a/theme/src/client/components/Blog/VPBlogProfile.vue b/theme/src/client/components/Blog/VPBlogProfile.vue
index adf0ee13..396e570e 100644
--- a/theme/src/client/components/Blog/VPBlogProfile.vue
+++ b/theme/src/client/components/Blog/VPBlogProfile.vue
@@ -6,9 +6,9 @@ import VPSocialLinks from '@theme/VPSocialLinks.vue'
 import { useData } from '../../composables/data.js'
 
 const { theme } = useData()
-const avatar = computed(() => theme.value.avatar)
+const profile = computed(() => theme.value.profile)
 const imageUrl = computed(() => {
-  const url = avatar.value?.url
+  const url = profile.value?.avatar ?? profile.value?.url
   if (!url)
     return ''
   if (isLinkHttp(url))
@@ -18,20 +18,20 @@ const imageUrl = computed(() => {
 </script>
 
 <template>
-  <div v-if="avatar" class="vp-blog-profile">
-    <p v-if="imageUrl" :class="{ circle: !!avatar.circle }">
-      <img :src="imageUrl" :alt="avatar.name">
+  <div v-if="profile" class="vp-blog-profile">
+    <p v-if="imageUrl" :class="{ circle: !!profile.circle }">
+      <img :src="imageUrl" :alt="profile.name">
     </p>
     <div class="profile-info">
-      <h3>{{ avatar.name }}</h3>
-      <p v-if="avatar.description" v-html="avatar.description" />
-      <div v-if="avatar.location" class="profile-location">
+      <h3>{{ profile.name }}</h3>
+      <p v-if="profile.description" v-html="profile.description" />
+      <div v-if="profile.location" class="profile-location">
         <span class="vpi-location" />
-        <p v-if="avatar.location" v-html="avatar.location" />
+        <p v-if="profile.location" v-html="profile.location" />
       </div>
-      <div v-if="avatar.organization" class="profile-organization">
+      <div v-if="profile.organization" class="profile-organization">
         <span class="vpi-organization" />
-        <p v-if="avatar.organization" v-html="avatar.organization" />
+        <p v-if="profile.organization" v-html="profile.organization" />
       </div>
     </div>
     <div v-if="theme.social" class="profile-social">
diff --git a/theme/src/client/components/Home/VPHomeProfile.vue b/theme/src/client/components/Home/VPHomeProfile.vue
index ea336019..2e09b21a 100644
--- a/theme/src/client/components/Home/VPHomeProfile.vue
+++ b/theme/src/client/components/Home/VPHomeProfile.vue
@@ -9,14 +9,14 @@ const props = defineProps<PlumeThemeHomeProfile>()
 
 const { theme } = useData()
 
-const avatar = computed(() => theme.value.avatar)
+const rawProfile = computed(() => theme.value.profile)
 
 const profile = computed(() => {
   return {
-    name: props.name || avatar.value?.name,
-    description: props.description || avatar.value?.description,
-    avatar: props.avatar || avatar.value?.url,
-    circle: props.circle || avatar.value?.circle,
+    name: props.name || rawProfile.value?.name,
+    description: props.description || rawProfile.value?.description,
+    avatar: props.avatar || rawProfile.value?.avatar || rawProfile.value?.url,
+    circle: props.circle || rawProfile.value?.circle,
   }
 })
 </script>
diff --git a/theme/src/client/components/VPEncryptGlobal.vue b/theme/src/client/components/VPEncryptGlobal.vue
index 0dab1c2c..076d69d3 100644
--- a/theme/src/client/components/VPEncryptGlobal.vue
+++ b/theme/src/client/components/VPEncryptGlobal.vue
@@ -8,16 +8,16 @@ import { useGlobalEncrypt } from '../composables/encrypt.js'
 const { theme, site } = useData()
 const { compareGlobal } = useGlobalEncrypt()
 
-const avatar = computed(() => theme.value.avatar)
-const title = computed(() => avatar.value?.name || site.value.title)
+const profile = computed(() => theme.value.profile)
+const title = computed(() => profile.value?.name || site.value.title)
 </script>
 
 <template>
   <div class="vp-global-encrypt">
     <div class="global-encrypt-container">
-      <div v-if="avatar || title" class="profile">
-        <p v-if="avatar" class="avatar" :class="{ circle: avatar.circle }">
-          <img :src="avatar.url" :alt="avatar.name">
+      <div v-if="profile || title" class="profile">
+        <p v-if="profile" class="avatar" :class="{ circle: profile.circle }">
+          <img :src="profile.avatar ?? profile.url" :alt="profile.name">
         </p>
         <h3 v-if="title">
           {{ title }}
diff --git a/theme/src/node/config/resolveThemeData.ts b/theme/src/node/config/resolveThemeData.ts
index 9adf7622..d61cb7ad 100644
--- a/theme/src/node/config/resolveThemeData.ts
+++ b/theme/src/node/config/resolveThemeData.ts
@@ -4,7 +4,7 @@ import type { NavItem, PlumeThemeLocaleOptions } from '../../shared/index.js'
 import { PRESET_LOCALES } from '../locales/index.js'
 import { withBase } from '../utils.js'
 
-const EXCLUDE_LIST = ['locales', 'sidebar', 'navbar', 'notes', 'article']
+const EXCLUDE_LIST = ['locales', 'sidebar', 'navbar', 'notes', 'article', 'avatar']
 // 过滤不需要出现在多语言配置中的字段
 const EXCLUDE_LOCALE_LIST = [...EXCLUDE_LIST, 'blog', 'appearance']
 
@@ -17,12 +17,22 @@ export function resolveThemeData(app: App, options: PlumeThemeLocaleOptions): Pl
       themeData[key] = value
   })
 
+  // TODO: 正式版中需删除此代码
+  if (options.avatar) {
+    themeData.profile ??= options.avatar
+  }
+
   entries(options.locales || {}).forEach(([locale, opt]) => {
     themeData.locales![locale] = {}
     entries(opt).forEach(([key, value]) => {
       if (!EXCLUDE_LOCALE_LIST.includes(key))
         themeData.locales![locale][key] = value
     })
+
+    // TODO: 正式版中需删除此代码
+    if (opt.avatar) {
+      themeData.locales![locale].profile ??= opt.avatar
+    }
   })
 
   const blog = options.blog || {}
diff --git a/theme/src/node/plugins/getPlugins.ts b/theme/src/node/plugins/getPlugins.ts
index 29350018..c5cb7ad8 100644
--- a/theme/src/node/plugins/getPlugins.ts
+++ b/theme/src/node/plugins/getPlugins.ts
@@ -187,7 +187,7 @@ export function getPlugins({
   if (pluginOptions.seo !== false && hostname && isProd) {
     plugins.push(seoPlugin({
       hostname,
-      author: localeOptions.locales?.['/'].avatar?.name || localeOptions.avatar?.name,
+      author: localeOptions.locales?.['/'].profile?.name || localeOptions.profile?.name || localeOptions.locales?.['/'].avatar?.name || localeOptions.avatar?.name,
     }))
   }
 
diff --git a/theme/src/node/plugins/resolveAutoFrontmatterOptions.ts b/theme/src/node/plugins/resolveAutoFrontmatterOptions.ts
index 646890c4..357d32b8 100644
--- a/theme/src/node/plugins/resolveAutoFrontmatterOptions.ts
+++ b/theme/src/node/plugins/resolveAutoFrontmatterOptions.ts
@@ -56,9 +56,9 @@ export function resolveAutoFrontmatterOptions(
         return author
       if (data.friends)
         return
-      const avatar = resolveOptions(relativePath).avatar
+      const profile = resolveOptions(relativePath).profile ?? resolveOptions(relativePath).avatar
 
-      return avatar?.name || pkg.author || ''
+      return profile?.name || pkg.author || ''
     },
     createTime(formatTime: string, { createTime }, data: any) {
       if (formatTime)
diff --git a/theme/src/shared/options/locale.ts b/theme/src/shared/options/locale.ts
index 38146989..17f0a522 100644
--- a/theme/src/shared/options/locale.ts
+++ b/theme/src/shared/options/locale.ts
@@ -31,11 +31,16 @@ export interface PlumeThemeLocaleData extends LocaleData {
   darkModeSwitchTitle?: string
 
   /**
-   * 配置博主拥有者信息
-   *
-   * 显示在右侧侧边栏
+   * @deprecated 弃用，使用 `profile` 代替
    */
-  avatar?: PlumeThemeAvatar
+  avatar?: PlumeThemeProfile
+
+  /**
+   * 配置博主拥有者 个人资料
+   *
+   * 显示在博客右侧侧边栏
+   */
+  profile?: PlumeThemeProfile
 
   /**
    * 社交账号配置
@@ -238,11 +243,20 @@ export interface PlumeThemeLocaleData extends LocaleData {
 
 /** =========================== Avatar ================================ */
 
-export interface PlumeThemeAvatar {
+/**
+ * 个人资料
+ */
+export interface PlumeThemeProfile {
   /**
+   * @deprecated 弃用，使用 `avatar` 代替
    * 头像链接
    */
   url?: string
+
+  /**
+   * 头像链接地址
+   */
+  avatar?: string
   /**
    * 名称
    */