valaxy 0.17.0-beta.2 → 0.17.0-beta.4

package/client/components/ValaxyCopyright.vue

@@ -38,7 +38,7 @@ const licenseHtml = computed(() => {
         {{ t('post.copyright.link') + t('symbol.colon') }}
       </strong>
       <a :href="url" target="_blank" :title="t('post.copyright.link')">
-        {{ url }}
+        {{ decodeURI(url) }}
       </a>
     </li>
     <li class="post-copyright-license">

package/client/composables/categories.ts

@@ -1,6 +1,6 @@
 import type { MaybeRef } from '@vueuse/core'
 import { computed, unref } from 'vue'
-import type { Post } from '../..'
+import type { Post } from '../../types'
 import { useSiteStore } from '../stores'
 
 export interface BaseCategory {
@@ -16,10 +16,10 @@ export interface CategoryList {
    * total posts
    */
   total: number
-  children: (Post | CategoryList)[]
+  children: Map<string, Post | CategoryList>
 }
 export type Category = CategoryList
-export type Categories = (Post | CategoryList)[]
+export type Categories = Map<string, Post | CategoryList>
 
 // todo write unit test
 export function isCategoryList(category: any): category is CategoryList {
@@ -53,12 +53,12 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
     const categoryList: CategoryList = {
       name: 'All',
       total: posts.length,
-      children: [
-        { name: 'Uncategorized', total: 0, children: [] },
-      ],
+      children: new Map([
+        ['Uncategorized', { name: 'Uncategorized', total: 0, children: new Map() }],
+      ]),
     }
 
-    const uncategorized = categoryList.children.find(item => item.name === 'Uncategorized')!
+    const uncategorized = categoryList.children.get('Uncategorized')!
 
     posts.forEach((post: Post) => {
       if (post.categories) {
@@ -69,20 +69,21 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
           let parentCategory: CategoryList = curCategoryList
 
           post.categories.forEach((categoryName, i) => {
+            // console.log(parentCategory, curCategoryList.children, 'post', categoryName)
             curCategoryList.total += 1
-            curCategoryList = (curCategoryList.children.find(item => item.name === categoryName)) as CategoryList
+            curCategoryList = curCategoryList.children.get(categoryName) as CategoryList
 
             if (!curCategoryList) {
               curCategoryList = {
                 name: categoryName,
                 total: 0,
-                children: [],
+                children: new Map(),
               }
-              parentCategory.children.push(curCategoryList)
+              parentCategory.children.set(categoryName, curCategoryList)
             }
 
             if (i === len - 1) {
-              curCategoryList.children.push(post)
+              curCategoryList.children.set(post.path!, post)
               curCategoryList.total += 1
             }
 
@@ -92,23 +93,25 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
         else {
           // for string
           const categoryName = post.categories
-          const curCategory = categoryList.children.find(item => item.name === categoryName)
+          const curCategory = categoryList.children.get(categoryName)
           if (curCategory) {
             curCategory.total += 1
-            curCategory.children.push(post)
+            curCategory.children.set(post.path!, post)
           }
           else {
-            categoryList.children.push({
+            categoryList.children.set(categoryName, {
               name: categoryName,
               total: 1,
-              children: [post],
+              children: new Map([
+                [post.path!, post],
+              ]),
             })
           }
         }
       }
       else {
         uncategorized.total += 1
-        uncategorized.children.push(post)
+        uncategorized.children.set(post.path!, post)
       }
     })
 
@@ -116,7 +119,7 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
 
     // clear uncategorized
     if (uncategorized!.total === 0)
-      categoryList.children.shift()
+      categoryList.children.delete('Uncategorized')
 
     if (!categories) {
       return categoryList
@@ -125,7 +128,7 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
       let curCategoryList = categoryList
       const categoryArr = categories.split('/')
       for (const categoryName of categoryArr) {
-        const tempCList = curCategoryList.children.find(item => item.name === categoryName)
+        const tempCList = curCategoryList.children.get(categoryName)
         if (tempCList && tempCList.children) {
           curCategoryList = tempCList as CategoryList
         }
@@ -147,10 +150,7 @@ export function useCategories(category?: MaybeRef<string>, posts: Post[] = []) {
 export function removeItemFromCategory(categoryList: CategoryList, categoryName: string) {
   if (isCategoryList(categoryList)) {
     const categoryArr = categoryName.split('/')
-    // todo loop find
-    const categoryListItemIndex = categoryList.children.findIndex(item => item.name === categoryArr[0])
-
-    categoryList.children.splice(categoryListItemIndex, 1)
+    categoryList.children.delete(categoryArr[0])
   }
 }
 

package/client/composables/post.ts

@@ -18,9 +18,12 @@ export function usePostTitle(post: ComputedRef<Post>) {
  * get all page in 'pages' folder
  */
 export function usePageList() {
+  const router = useRouter()
   return computed<Post[]>(() => {
     const excludePages = ['/:..all', '/:all(.*)*', '/', '/:path(.*)']
-    const router = useRouter()
+    if (!router)
+      return []
+
     const routes = router.getRoutes()
       .filter(i => i.name)
       .filter(i => i.meta)

package/client/composables/tags.ts

@@ -1,5 +1,5 @@
 import { computed } from 'vue'
-import type { Post } from '../..'
+import type { Post } from '../../types'
 import { useSiteStore } from '../stores'
 
 export type Tags = Map<string, {

package/client/config.ts

@@ -30,6 +30,9 @@ export const valaxyConfigRef = shallowRef<ValaxyConfig>(parse<ValaxyConfig>(vala
 
 export const valaxyContextRef = shallowRef<ValaxyContext>(parse<ValaxyContext>(valaxyContext))
 
+valaxyConfigRef.value = parse<ValaxyConfig>(valaxyConfig)
+valaxyContextRef.value = parse<ValaxyContext>(valaxyContext)
+
 // hmr
 if (import.meta.hot) {
   // /@valaxyjs/config must be static string

package/client/modules/valaxy.ts

@@ -39,8 +39,7 @@ import valaxyMessages from '/@valaxyjs/locales'
 function shouldHotReload(payload: PageDataPayload): boolean {
   const payloadPath = payload.path.replace(/(\bindex)?\.md$/, '')
   const locationPath = location.pathname.replace(/(\bindex)?\.html$/, '')
-  // console.log(payloadPath, locationPath)
-  return ensureSuffix('/', payloadPath) === ensureSuffix('/', locationPath)
+  return ensureSuffix('/', encodeURI(payloadPath)) === ensureSuffix('/', encodeURI(locationPath))
 }
 
 export async function install({ app, router }: ViteSSGContext, config: ComputedRef<ValaxyConfig<DefaultTheme.Config>>) {
@@ -62,7 +61,7 @@ export async function install({ app, router }: ViteSSGContext, config: ComputedR
 function handleHMR(router: Router): void {
   // update route.data on HMR updates of active page
   if (import.meta.hot) {
-    import.meta.hot!.on('valaxy:pageData', (payload: PageDataPayload) => {
+    import.meta.hot.on('valaxy:pageData', (payload: PageDataPayload) => {
       if (shouldHotReload(payload)) {
         // console.log(payload.pageData.headers)
         Object.assign(router.currentRoute.value.meta, payload.pageData)

package/client/stores/site.ts

@@ -12,6 +12,7 @@ import type { PageDataPayload } from '../../types'
  */
 export const useSiteStore = defineStore('site', () => {
   const reload = ref(1)
+  // for dev hot reload
   const postList = computed(() => {
     if (reload.value)
       return usePostList().value
@@ -19,6 +20,8 @@ export const useSiteStore = defineStore('site', () => {
       return usePostList().value
   })
 
+  // const postList = usePostList()
+
   const router = useRouter()
   if (router) {
     router.isReady().then(() => {
@@ -30,19 +33,22 @@ export const useSiteStore = defineStore('site', () => {
           if (payload.path.endsWith('.md'))
             path = payload.path.slice(0, -3)
 
-          const routeName = path.split('/').slice(1).join('-')
-
+          const routeName = path
           if (!router.hasRoute(routeName))
             return
 
           // can not use generatedRoutes, otherwise will trigger ValaxyMain refresh
           const route = router.getRoutes().find(r => r.name === routeName)!
           router.removeRoute(routeName)
-          if (route.meta)
-            route.meta.frontmatter = payload.pageData.frontmatter
+          if (route.meta) {
+            route.meta.frontmatter = {
+              ...route.meta.frontmatter,
+              ...payload.pageData.frontmatter,
+            }
+          }
           router.addRoute(route)
 
-          // trigger computed reload
+          // trigger `computed` reload, not server
           reload.value += 1
         })
       }

package/client/utils/time.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs'
 import utc from 'dayjs/plugin/utc'
 import timezone from 'dayjs/plugin/timezone'
 
-import type { Post } from '../..'
+import type { Post } from '../../types'
 
 dayjs.extend(utc)
 dayjs.extend(timezone)