valaxy 0.25.8 → 0.25.10

package/client/composables/collections.ts

@@ -1,5 +1,8 @@
 import type { CollectionConfig } from '../define'
-import { ref } from 'vue'
+import collections from '#valaxy/blog/collections'
+
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
 
 /**
  * Composable for Collections
@@ -7,22 +10,28 @@ import { ref } from 'vue'
  * @example /collections/love-letters/1
  */
 export function useCollections() {
-  // TODO
+  return {
+    collections: computed(() => collections),
+  }
+}
+
+/**
+ * 获取当前集合
+ */
+export function useCollection() {
+  const route = useRoute()
+  const collectionId = computed(() => {
+    if (route.path.startsWith('/collections/')) {
+      return route.path.split('/')[2] // 获取集合 ID
+    }
+    return ''
+  })
 
-  const collections = ref<CollectionConfig[]>([
-    {
-      id: 'i-and-she',
-      name: 'I and She',
-      description: 'Love letters from the past',
-    },
-    {
-      id: 'love-and-peace',
-      name: '爱与和平',
-      description: 'Recipes for a good life',
-    },
-  ])
+  const collection = computed<CollectionConfig>(() => {
+    return collections.find(item => item.key === collectionId.value)
+  })
 
   return {
-    collections,
+    collection,
   }
 }

package/client/define/collection.ts

@@ -1,9 +1,12 @@
 export interface CollectionConfig {
+  title?: string
+  key?: string
   /**
-   * auto-generated by your collection path
-   * @example /collections/love-letters/1 => id: 'love-letters'
+   * if key is not provided, path is required
+   *
+   * if key is provided, path = `/collections/${key}`
    */
-  id?: string
+  path?: string
   /**
    * @en
    * The name of the collection.
@@ -16,6 +19,19 @@ export interface CollectionConfig {
   description?: string
   categories?: string[]
   tags?: string[]
+
+  /**
+   * items
+   */
+  items?: {
+    title?: string
+    /**
+     * 合集文章的唯一索引
+     *
+     * 对应路径为 `/collections/${key}/${item.key}`
+     */
+    key?: string
+  }[]
 }
 
 /**

package/client/locales/en.yml

@@ -26,6 +26,7 @@ menu:
   categories: Categories
   tags: Tags
   posts: Posts
+  collections: Collections
   about: About
   search: Search
 

package/client/locales/zh-CN.yml

@@ -26,6 +26,7 @@ menu:
   categories: 分类
   tags: 标签
   posts: 博客文章
+  collections: 合集
   about: 关于
   search: 搜索
 

package/client/shims.d.ts

@@ -7,4 +7,12 @@ declare module 'virtual:valaxy-theme' {
 
 declare module '#valaxy/styles' {
   // side-effects only
+  export default string
+}
+
+// valaxy features
+declare module '#valaxy/blog/collections' {
+
+  const collections: Collection[]
+  export default collections
 }

package/dist/{chunk-5GRPXDJR.js → chunk-JHXXCWZC.js}

@@ -4,7 +4,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.25.8";
+var version = "0.25.10";
 
 // node/modules/fuse.ts
 import path4 from "path";
@@ -523,7 +523,7 @@ var EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i;
 
 // shared/utils/i18n.ts
 function tObject(data, lang) {
-  if (typeof data === "object") {
+  if (data && typeof data === "object") {
     return data[lang] || Object.values(data)[0] || "";
   }
   return data;
@@ -554,8 +554,8 @@ var isInstalledGlobally = {};
 async function resolveImportUrl(id) {
   return toAtFS(await resolveImportPath(id, true));
 }
-function toAtFS(path17) {
-  return `/@fs${ensurePrefix("/", slash(path17))}`;
+function toAtFS(path18) {
+  return `/@fs${ensurePrefix("/", slash(path18))}`;
 }
 async function resolveImportPath(importName, ensure = false) {
   try {
@@ -900,7 +900,8 @@ async function isPagesDirExist(root) {
 // node/modules/fuse.ts
 async function generateFuseList(options) {
   consola9.start(`Generate List for Fuse Search by (${colors7.cyan("fuse.js")}) ...`);
-  const files = await fg2(`${options.userRoot}/pages/posts/**/*.md`);
+  const pattern = options.config.siteConfig.fuse.pattern || path4.join(options.userRoot, "pages/**/*.md");
+  const files = await fg2(pattern);
   const posts = [];
   for await (const i of files) {
     const raw = fs7.readFileSync(i, "utf-8");
@@ -1095,19 +1096,19 @@ async function getPosts(params, options) {
   });
   const posts = [];
   for (const rawPost of filteredPosts) {
-    const { data, path: path17, content, excerpt } = rawPost;
+    const { data, path: path18, content, excerpt } = rawPost;
     if (!data.date)
-      data.date = await getCreatedTime(path17);
+      data.date = await getCreatedTime(path18);
     if (siteConfig.lastUpdated) {
       if (!data.updated)
-        data.updated = await getUpdatedTime(path17);
+        data.updated = await getUpdatedTime(path18);
     }
     const fullText = options.config.modules.rss.fullText;
     const rssContent = fullText ? content : excerpt || content.slice(0, 100);
     const html = markdown.render(rssContent).replace('src="/', `src="${DOMAIN}/`);
     if (data.image?.startsWith("/"))
       data.image = DOMAIN + data.image;
-    const link = DOMAIN + path17.replace(`${options.userRoot}/pages`, "").replace(/\.md$/, "");
+    const link = DOMAIN + path18.replace(`${options.userRoot}/pages`, "").replace(/\.md$/, "");
     const tip = `<br/><p>${lang === "zh-CN" ? `\u8BBF\u95EE <a href="${link}" target="_blank">${link}</a> ${fullText ? "\u67E5\u770B\u539F\u6587" : "\u9605\u8BFB\u5168\u6587"}\u3002` : `Visit <a href="${link}" target="_blank">${link}</a> to ${fullText ? "view original article" : "read more"}.`}</p>`;
     posts.push({
       ...data,
@@ -1128,7 +1129,7 @@ async function writeFeed(feedOptions, posts, options, feedNameMap) {
   const feed = new Feed(feedOptions);
   posts.forEach((item) => feed.addItem(item));
   await fs9.ensureDir(dirname3(`./dist/${feedNameMap.atom}`));
-  const path17 = resolve5(options.userRoot, "./dist");
+  const path18 = resolve5(options.userRoot, "./dist");
   const publicFolder = resolve5(options.userRoot, "public");
   const { config } = options;
   const siteConfig = config.siteConfig;
@@ -1141,7 +1142,7 @@ async function writeFeed(feedOptions, posts, options, feedNameMap) {
   const types = ["rss", "atom", "json"];
   for (const type of types) {
     let data = "";
-    const distFeedPath = `${path17}/${feedNameMap[type]}`;
+    const distFeedPath = `${path18}/${feedNameMap[type]}`;
     if (type === "rss")
       data = feed.rss2();
     else if (type === "atom")
@@ -1214,7 +1215,7 @@ var rssModule = defineValaxyModule({
 });
 
 // node/cli/build.ts
-import path13 from "path";
+import path14 from "path";
 import process9 from "process";
 import { consola as consola16 } from "consola";
 import { colors as colors15 } from "consola/utils";
@@ -1224,7 +1225,7 @@ import { mergeConfig as mergeConfig4 } from "vite";
 import { join as join8, resolve as resolve13 } from "path";
 import { consola as consola14 } from "consola";
 import { colors as colors12 } from "consola/utils";
-import fs21 from "fs-extra";
+import fs22 from "fs-extra";
 import { mergeConfig as mergeViteConfig2, build as viteBuild } from "vite";
 import generateSitemap from "vite-ssg-sitemap";
 import { build as viteSsgBuild } from "vite-ssg/node";
@@ -1303,10 +1304,10 @@ async function getIndexHtml({ clientRoot, themeRoot, userRoot: userRoot2, config
     `;
   }
   for (const root of roots) {
-    const path17 = join2(root, "index.html");
-    if (!fs10.existsSync(path17))
+    const path18 = join2(root, "index.html");
+    if (!fs10.existsSync(path18))
       continue;
-    const indexHtml = await fs10.readFile(path17, "utf-8");
+    const indexHtml = await fs10.readFile(path18, "utf-8");
     head += `
 ${(indexHtml.match(/<head>([\s\S]*?)<\/head>/i)?.[1] || "").trim()}`;
     body += `
@@ -1435,16 +1436,18 @@ function getDefine(_options) {
 }
 async function getAlias(options) {
   const alias = [
+    /**
+     * virtual module alias
+     * `/` 开头无法 declare module 类型
+     *
+     * #valaxy/* => /@valaxyjs/*
+     */
+    { find: /^#valaxy\/(.*)/, replacement: "/@valaxyjs/$1" },
     { find: "~/", replacement: `${toAtFS(options.userRoot)}/` },
     { find: "valaxy/client/", replacement: `${toAtFS(options.clientRoot)}/` },
     { find: "valaxy/package.json", replacement: toAtFS(resolve6(options.clientRoot, "../package.json")) },
     { find: /^valaxy$/, replacement: toAtFS(resolve6(options.clientRoot, "index.ts")) },
     { find: "@valaxyjs/client/", replacement: `${toAtFS(options.clientRoot)}/` },
-    // virtual module alias
-    {
-      find: /^#valaxy\/(.*)/,
-      replacement: "/@valaxyjs/$1"
-    },
     // import theme
     { find: "virtual:valaxy-theme", replacement: `${toAtFS(options.themeRoot)}/client/index.ts` },
     { find: `valaxy-theme-${options.theme}/client`, replacement: `${toAtFS(resolve6(options.themeRoot))}/client/index.ts` },
@@ -1999,8 +2002,8 @@ function linkPlugin(md3, externalAttrs, base) {
     let url = hrefAttr[1];
     const indexMatch = url.match(indexRE);
     if (indexMatch) {
-      const [, path17, hash] = indexMatch;
-      url = path17 + hash;
+      const [, path18, hash] = indexMatch;
+      url = path18 + hash;
     } else {
       let cleanUrl = url.replace(/[?#].*$/, "");
       if (cleanUrl.endsWith(".md")) {
@@ -2860,10 +2863,10 @@ function createClientSetupPlugin({ clientRoot, themeRoot, userRoot: userRoot2 })
           themeRoot,
           userRoot2
         ]).map((i) => join4(i, "setup", name));
-        setups.forEach((path17, idx) => {
-          if (!existsSync(path17))
+        setups.forEach((path18, idx) => {
+          if (!existsSync(path18))
             return;
-          imports.push(`import __n${idx} from '${toAtFS(path17)}'`);
+          imports.push(`import __n${idx} from '${toAtFS(path18)}'`);
           let fn = `__n${idx}`;
           if (/\binjection_return\b/.test(code))
             fn = `injection_return = ${fn}`;
@@ -2872,7 +2875,7 @@ function createClientSetupPlugin({ clientRoot, themeRoot, userRoot: userRoot2 })
           else
             fn += "()";
           injections.push(
-            `// ${path17}`,
+            `// ${path18}`,
             fn
           );
         });
@@ -2920,9 +2923,9 @@ function deepMerge(a, b, rootPath = "") {
 async function loadSetups(roots, name, arg, initial, merge = true) {
   let returns = initial;
   for (const root of roots) {
-    const path17 = resolve8(root, "setup", name);
-    if (fs13.existsSync(path17)) {
-      const setup = await jiti2.import(path17, { default: true });
+    const path18 = resolve8(root, "setup", name);
+    if (fs13.existsSync(path18)) {
+      const setup = await jiti2.import(path18, { default: true });
       const result = await setup(arg);
       if (result !== null) {
         returns = merge ? deepMerge(returns, result) : result;
@@ -3055,7 +3058,7 @@ async function createUnocssPlugin(options) {
 // node/plugins/valaxy/index.ts
 import { consola as consola12 } from "consola";
 import { colors as colors11 } from "consola/utils";
-import fs19 from "fs-extra";
+import fs20 from "fs-extra";
 import { join as join7, relative, resolve as resolve10 } from "pathe";
 
 // node/virtual/addons.ts
@@ -3074,6 +3077,35 @@ export default [${components}]`;
   }
 };
 
+// node/virtual/blogs.ts
+import path8 from "path";
+import fs16 from "fs-extra";
+function createBlogTemplate(name) {
+  return {
+    id: `/@valaxyjs/blog/${name}s`,
+    async getContent({ userRoot: userRoot2 }) {
+      const root = path8.resolve(userRoot2, "pages", "collections");
+      if (!await fs16.pathExists(root)) {
+        return `export default []`;
+      }
+      const isDir = (file) => fs16.statSync(path8.join(root, file)).isDirectory();
+      const files = fs16.readdirSync(root).filter((file) => isDir(file)).map((file) => path8.join(root, file, "index.ts"));
+      const imports = [];
+      const getImportedName = (idx) => `__valaxy_${name}_${idx + 1}`;
+      files.forEach((file, idx) => {
+        const importedName = getImportedName(idx);
+        imports.push(`import ${importedName} from '${toAtFS(file)}'`);
+      });
+      imports.push(`export default [${files.map((_, idx) => getImportedName(idx)).join(", ")}]`);
+      return imports.join("\n");
+    }
+  };
+}
+var configs = [
+  "collection"
+];
+var templateBlogs = configs.map(createBlogTemplate);
+
 // node/virtual/config.ts
 var templateConfig = {
   id: "/@valaxyjs/config",
@@ -3093,7 +3125,7 @@ var templateConfig = {
 };
 
 // node/virtual/locales.ts
-import fs16 from "fs-extra";
+import fs17 from "fs-extra";
 var templateLocales = {
   id: "/@valaxyjs/locales",
   async getContent({ roots, config }) {
@@ -3113,7 +3145,7 @@ var templateLocales = {
     roots.forEach((root, i) => {
       languages.forEach((lang) => {
         const langYml = `${root}/locales/${lang}.yml`;
-        if (fs16.existsSync(langYml) && fs16.readFileSync(langYml, "utf-8")) {
+        if (fs17.existsSync(langYml) && fs17.readFileSync(langYml, "utf-8")) {
           const varName = lang.replace("-", "") + i;
           imports.unshift(`import ${varName} from "${toAtFS(langYml)}"`);
           imports.push(`messages['${lang}'] = replaceArrMerge(${varName}, messages['${lang}'])`);
@@ -3162,13 +3194,14 @@ var templates = [
   templateAddons,
   templateConfig,
   templateLocales,
-  templateStyles
+  templateStyles,
+  ...templateBlogs
 ];
 
 // node/plugins/markdown/markdownToVue.ts
 import _debug2 from "debug";
 import { LRUCache } from "lru-cache";
-import path11 from "pathe";
+import path12 from "pathe";
 
 // node/app/index.ts
 import { createHooks } from "hookable";
@@ -3227,10 +3260,10 @@ function createTransformCodeBlock(options) {
 
 // node/plugins/markdown/transform/dead-links.ts
 import { slash as slash4 } from "@antfu/utils";
-import fs17 from "fs-extra";
-import path8 from "pathe";
+import fs18 from "fs-extra";
+import path9 from "pathe";
 function createScanDeadLinks(options) {
-  const srcDir = path8.resolve(options.userRoot, "pages");
+  const srcDir = path9.resolve(options.userRoot, "pages");
   const { ignoreDeadLinks } = options.config.build;
   const publicDir = options.config.vite?.publicDir || "public";
   return (code, id) => {
@@ -3240,7 +3273,7 @@ function createScanDeadLinks(options) {
     const file = id;
     const deadLinks = [];
     const recordDeadLink = (url) => {
-      deadLinks.push({ url, file: path8.relative(srcDir, fileOrig) });
+      deadLinks.push({ url, file: path9.relative(srcDir, fileOrig) });
     };
     function shouldIgnoreDeadLink(url) {
       if (!ignoreDeadLinks)
@@ -3260,7 +3293,7 @@ function createScanDeadLinks(options) {
       });
     }
     if (links) {
-      const dir = path8.dirname(file);
+      const dir = path9.dirname(file);
       for (let url of links) {
         const { pathname } = new URL(url, "http://a.com");
         if (!treatAsHtml(pathname))
@@ -3270,11 +3303,11 @@ function createScanDeadLinks(options) {
           url += `index`;
         const resolved = decodeURIComponent(
           slash4(
-            url.startsWith("/") ? url.slice(1) : path8.relative(srcDir, path8.resolve(dir, url))
+            url.startsWith("/") ? url.slice(1) : path9.relative(srcDir, path9.resolve(dir, url))
           )
           // /index => /
         ).replace(/\/index$/, "");
-        if (!options.pages.includes(resolved) && !fs17.existsSync(path8.resolve(dir, publicDir, `${resolved}.html`)) && !shouldIgnoreDeadLink(url)) {
+        if (!options.pages.includes(resolved) && !fs18.existsSync(path9.resolve(dir, publicDir, `${resolved}.html`)) && !shouldIgnoreDeadLink(url)) {
           recordDeadLink(url);
         }
       }
@@ -3436,8 +3469,8 @@ function transformHexoTags(code, id) {
 }
 
 // node/plugins/markdown/transform/markdown.ts
-import path9 from "path";
-import fs18 from "fs-extra";
+import path10 from "path";
+import fs19 from "fs-extra";
 function genProvideCode(name, data) {
   return [
     `const $${name} = ${transformObject(data)}`,
@@ -3468,8 +3501,8 @@ function injectPageDataCode(pageData) {
   return vueContextImports;
 }
 function createTransformMarkdown(options) {
-  const loaderVuePath = path9.resolve(options.clientRoot, "templates", "loader.vue");
-  const loaderVue = fs18.readFileSync(loaderVuePath, "utf-8");
+  const loaderVuePath = path10.resolve(options.clientRoot, "templates", "loader.vue");
+  const loaderVue = fs19.readFileSync(loaderVuePath, "utf-8");
   return (code, id, pageData) => {
     const isDev = options.mode === "dev";
     if (!isDev) {
@@ -3508,7 +3541,7 @@ ${code.slice(injectB)}`;
 }
 
 // node/plugins/markdown/transform/page-data.ts
-import path10 from "pathe";
+import path11 from "pathe";
 function getHeadMetaContent(head, name) {
   if (!head || !head.length)
     return void 0;
@@ -3525,7 +3558,7 @@ function inferDescription(frontmatter) {
 }
 async function generatePageData(code, id, options) {
   const fileInfo = Valaxy.state.idMap.get(id);
-  const relativePath = path10.relative(options.userRoot, id);
+  const relativePath = path11.relative(options.userRoot, id);
   const fm = JSON.parse(JSON.stringify(fileInfo?.frontmatter));
   const pageData = {
     title: fm.title || fileInfo?.title || "",
@@ -3582,7 +3615,7 @@ async function createMarkdownToVueRenderFn(options, _viteConfig) {
   const isBuild = options.mode === "build";
   return async (code, id) => {
     const file = id;
-    const relativePath = path11.relative(srcDir, file);
+    const relativePath = path12.relative(srcDir, file);
     const deadLinks = scanDeadLinks(code, id);
     const cacheKey = JSON.stringify({ code, id });
     if (isBuild) {
@@ -3621,7 +3654,7 @@ async function createMarkdownToVueRenderFn(options, _viteConfig) {
 var nullVue = 'import { defineComponent } from "vue"; export default defineComponent({ render: () => null });';
 function generateAppVue(root) {
   const appVue = join7(root, "App.vue");
-  if (!fs19.existsSync(appVue))
+  if (!fs20.existsSync(appVue))
     return nullVue;
   const scripts = [
     `import AppVue from "${toAtFS(appVue)}"`,
@@ -3751,9 +3784,9 @@ async function createValaxyPlugin(options, serverOptions = {}) {
           const endCount = countPerformanceTime();
           const content = await read();
           const { code, pageData } = await markdownToVue(content, file);
-          const path17 = `/${relative(`${options.userRoot}/pages`, file)}`;
+          const path18 = `/${relative(`${options.userRoot}/pages`, file)}`;
           const payload = {
-            path: path17,
+            path: path18,
             pageData
           };
           server.hot.send({
@@ -3780,7 +3813,7 @@ async function createValaxyPlugin(options, serverOptions = {}) {
 }
 
 // node/plugins/vueRouter.ts
-import fs20 from "fs-extra";
+import fs21 from "fs-extra";
 import matter3 from "gray-matter";
 import { convert } from "html-to-text";
 import { MarkdownItAsync } from "markdown-it-async";
@@ -3891,10 +3924,16 @@ async function createRouterPlugin(valaxyApp) {
             layout: "post"
           });
         }
+      } else if (route.fullPath.startsWith("/collections/")) {
+        if (route.fullPath.split("/").length > 3) {
+          route.addToMeta({
+            layout: "collection"
+          });
+        }
       }
-      const path17 = route.components.get("default") || "";
-      if (path17.endsWith(".md")) {
-        const md3 = fs20.readFileSync(path17, "utf-8");
+      const path18 = route.components.get("default") || "";
+      if (path18.endsWith(".md")) {
+        const md3 = fs21.readFileSync(path18, "utf-8");
         const { data, excerpt, content } = matter3(md3, matterOptions);
         const mdFm = data;
         const lastUpdated = options.config.siteConfig.lastUpdated;
@@ -3904,10 +3943,10 @@ async function createRouterPlugin(valaxyApp) {
           delete mdFm.photos;
         }
         if (!mdFm.date)
-          mdFm.date = (await fs20.stat(path17)).mtime;
+          mdFm.date = (await fs21.stat(path18)).mtime;
         if (lastUpdated) {
           if (!mdFm.updated)
-            mdFm.updated = (await fs20.stat(path17)).ctime;
+            mdFm.updated = (await fs21.stat(path18)).ctime;
         }
         if (mdFm.from) {
           if (Array.isArray(mdFm.from)) {
@@ -3964,7 +4003,7 @@ async function createRouterPlugin(valaxyApp) {
           data,
           excerpt,
           content,
-          path: path17
+          path: path18
         };
         valaxyConfig.extendMd?.(ctx);
       }
@@ -4178,13 +4217,13 @@ async function ssgBuild(valaxyApp, viteConfig = {}) {
   if (options.config.build.ssgForPagination) {
     defaultConfig.ssgOptions.includedRoutes = (paths, _routes) => {
       const newPaths = paths;
-      const posts = paths.filter((path17) => path17.startsWith("/posts/"));
+      const posts = paths.filter((path18) => path18.startsWith("/posts/"));
       const pageNumber = Math.ceil(posts.length / options.config.siteConfig.pageSize);
       consola14.info(`Generate ${colors12.yellow(pageNumber)} pages for pagination.`);
       for (let i = 1; i <= pageNumber; i++)
         newPaths.push(`/page/${i}`);
       if (!options.config.vite?.ssgOptions?.includeAllRoutes)
-        return newPaths.filter((path17) => !path17.split("/").some((p) => p.startsWith(":")));
+        return newPaths.filter((path18) => !path18.split("/").some((p) => p.startsWith(":")));
       else
         return newPaths;
     };
@@ -4195,14 +4234,14 @@ async function ssgBuild(valaxyApp, viteConfig = {}) {
 async function postProcessForSSG(options) {
   const { userRoot: userRoot2 } = options;
   const indexPath = resolve13(userRoot2, "dist/index.html");
-  if (fs21.existsSync(indexPath)) {
+  if (fs22.existsSync(indexPath)) {
     consola14.info("post process for ssg...");
-    const indexFile = await fs21.readFile(indexPath, "utf-8");
+    const indexFile = await fs22.readFile(indexPath, "utf-8");
     const htmlTag = "</html>";
     if (!indexFile.endsWith(htmlTag)) {
       consola14.warn("fix incomplete index.html...");
       const htmlTagStart = indexFile.lastIndexOf(htmlTag);
-      await fs21.writeFile(indexPath, indexFile.slice(0, htmlTagStart + htmlTag.length), "utf-8");
+      await fs22.writeFile(indexPath, indexFile.slice(0, htmlTagStart + htmlTag.length), "utf-8");
     }
   }
   if (!options.config.siteConfig.redirects?.useVueRouter)
@@ -4215,7 +4254,7 @@ async function generateClientRedirects(options) {
   const task = redirectRules.map(async (rule) => {
     const fromPath = join8(outputPath, `${rule.from}.html`);
     const toPath = join8(outputPath, `${rule.to}.html`);
-    const routeExist = await fs21.pathExists(toPath);
+    const routeExist = await fs22.pathExists(toPath);
     if (!routeExist)
       throw new Error(`the route of '${rule.to}' not exists`);
     await writeRedirectFiles(rule.to, fromPath);
@@ -4258,7 +4297,7 @@ async function createServer(valaxyApp, viteConfig = {}, serverOptions = {}) {
 
 // node/cli/utils/cli.ts
 import os from "os";
-import path12 from "path";
+import path13 from "path";
 import process8 from "process";
 import { consola as consola15 } from "consola";
 import { colors as colors14 } from "consola/utils";
@@ -4278,7 +4317,7 @@ function printInfo(options, port, remote) {
   console.log(`  ${colors14.bold("\u{1F30C} Valaxy")}  ${colors14.blue(`v${version}`)}`);
   console.log();
   console.log(`${colors14.dim("  \u{1FA90} theme  ")} > ${options.theme ? colors14.green(options.theme) : colors14.gray("none")} (${themeVersion})`);
-  console.log(`  ${colors14.dim("\u{1F4C1}")} ${colors14.dim(path12.resolve(options.userRoot))}`);
+  console.log(`  ${colors14.dim("\u{1F4C1}")} ${colors14.dim(path13.resolve(options.userRoot))}`);
   if (port) {
     console.log();
     console.log(`${colors14.dim("  Preview   ")} > ${colors14.cyan(`http://localhost:${colors14.bold(port)}/`)}`);
@@ -4356,7 +4395,7 @@ async function execBuild({ ssg, root, output, log }) {
   setEnvProd();
   if (!isPagesDirExist(root))
     process9.exit(0);
-  const userRoot2 = path13.resolve(root);
+  const userRoot2 = path14.resolve(root);
   const options = await resolveOptions({ userRoot: userRoot2 }, "build");
   setTimezone(options.config.siteConfig.timezone);
   printInfo(options);
@@ -4376,11 +4415,11 @@ async function execBuild({ ssg, root, output, log }) {
     valaxyViteConfig,
     {
       // avoid load userRoot/vite.config.ts repeatedly
-      configFile: path13.resolve(options.clientRoot, "vite.config.ts"),
+      configFile: path14.resolve(options.clientRoot, "vite.config.ts"),
       build: {
         // make out dir empty, https://vitejs.dev/config/#build-emptyoutdir
         emptyOutDir: true,
-        outDir: path13.resolve(options.userRoot, output)
+        outDir: path14.resolve(options.userRoot, output)
       },
       logLevel: log
     }
@@ -4437,18 +4476,18 @@ function registerBuildCommand(cli2) {
 }
 
 // node/cli/clean.ts
-import path14 from "path";
+import path15 from "path";
 import process10 from "process";
 import { consola as consola17 } from "consola";
-import fs22 from "fs-extra";
+import fs23 from "fs-extra";
 async function cleanDist() {
-  const distDir = path14.join(process10.cwd(), "dist");
-  const cacheDir = path14.join(process10.cwd(), ".valaxy");
+  const distDir = path15.join(process10.cwd(), "dist");
+  const cacheDir = path15.join(process10.cwd(), ".valaxy");
   consola17.box("\u{1F9F9} Starting clean...");
-  if (await fs22.exists(distDir)) {
+  if (await fs23.exists(distDir)) {
     consola17.info("dist directory exists, removing...");
     try {
-      await fs22.rm(distDir, { recursive: true, force: true });
+      await fs23.rm(distDir, { recursive: true, force: true });
       consola17.success("dist directory has been successfully removed.");
     } catch (error) {
       consola17.error("Failed to remove dist directory.");
@@ -4457,10 +4496,10 @@ async function cleanDist() {
   } else {
     consola17.info("No dist directory found, nothing to clean.");
   }
-  if (await fs22.exists(cacheDir)) {
+  if (await fs23.exists(cacheDir)) {
     consola17.info(".valaxy cache directory exists, removing...");
     try {
-      await fs22.rm(cacheDir, { recursive: true, force: true });
+      await fs23.rm(cacheDir, { recursive: true, force: true });
       consola17.success(".valaxy cache directory has been successfully removed.");
     } catch (error) {
       consola17.error("Failed to remove .valaxy cache directory.");
@@ -4539,7 +4578,7 @@ function registerDeployCommand(cli2) {
 }
 
 // node/cli/dev.ts
-import path15 from "path";
+import path16 from "path";
 import process13 from "process";
 import { mergeConfig as mergeConfig5 } from "vite";
 
@@ -4668,7 +4707,7 @@ async function startValaxyDev({
     // initial vite config
     ...defaultViteConfig,
     // avoid load userRoot/vite.config.ts repeatedly
-    configFile: path15.resolve(resolvedOptions.clientRoot, "vite.config.ts"),
+    configFile: path16.resolve(resolvedOptions.clientRoot, "vite.config.ts"),
     server: {
       watch: {
         // watch theme updated
@@ -4731,7 +4770,7 @@ import { consola as consola19 } from "consola";
 import { colors as colors17 } from "consola/utils";
 import dayjs2 from "dayjs";
 import { render } from "ejs";
-import fs24 from "fs-extra";
+import fs25 from "fs-extra";
 
 // node/cli/utils/constants.ts
 import process14 from "process";
@@ -4745,14 +4784,14 @@ date: <%=date%>
 
 // node/cli/utils/scaffold.ts
 import { readFile as readFile2 } from "fs/promises";
-import path16 from "path";
-import fs23 from "fs-extra";
+import path17 from "path";
+import fs24 from "fs-extra";
 async function getTemplate(layout) {
   const { clientRoot, themeRoot } = await resolveOptions({ userRoot });
   const roots = [userRoot, themeRoot, clientRoot];
   for (const root of roots) {
-    const scaffoldPath = path16.resolve(root, "scaffolds", `${layout}.md`);
-    if (await fs23.exists(scaffoldPath))
+    const scaffoldPath = path17.resolve(root, "scaffolds", `${layout}.md`);
+    if (await fs24.exists(scaffoldPath))
       return readFile2(scaffoldPath, "utf-8");
   }
   return false;
@@ -4766,11 +4805,11 @@ async function create(params) {
     const postFileName = `${params.title}${counter ? `-${counter}` : ""}`;
     const postFilePath = params.folder ? join9(postFileName, "index.md") : `${postFileName}.md`;
     const targetPath = resolve14(pagesPath, "posts", postFilePath);
-    if (!await fs24.exists(targetPath)) {
-      await fs24.ensureDir(dirname5(targetPath));
+    if (!await fs25.exists(targetPath)) {
+      await fs25.ensureDir(dirname5(targetPath));
       const content = await genLayoutTemplate(params);
       try {
-        await fs24.writeFile(targetPath, content, "utf-8");
+        await fs25.writeFile(targetPath, content, "utf-8");
         consola19.success(`[valaxy new]: successfully generated file ${colors17.magenta(targetPath)}`);
       } catch (e) {
         console.log(e);
@@ -4823,12 +4862,12 @@ function registerNewCommand(cli2) {
         describe: "Generate post with the current date"
       }).strict().help();
     },
-    async ({ title, folder, path: path17, date, layout }) => {
+    async ({ title, folder, path: path18, date, layout }) => {
       await create({
         title,
         date,
         layout,
-        path: path17,
+        path: path18,
         folder
       });
     }

package/dist/{config-DHcACRUt.d.ts → config-bf4WqwPK.d.ts}

@@ -61,6 +61,41 @@ declare namespace DefaultTheme {
     }
 }
 
+interface CollectionConfig {
+    title?: string;
+    key?: string;
+    /**
+     * if key is not provided, path is required
+     *
+     * if key is provided, path = `/collections/${key}`
+     */
+    path?: string;
+    /**
+     * @en
+     * The name of the collection.
+     *
+     * @zh
+     * 合集名称
+     */
+    name?: string;
+    cover?: string;
+    description?: string;
+    categories?: string[];
+    tags?: string[];
+    /**
+     * items
+     */
+    items?: {
+        title?: string;
+        /**
+         * 合集文章的唯一索引
+         *
+         * 对应路径为 `/collections/${key}/${item.key}`
+         */
+        key?: string;
+    }[];
+}
+
 interface Album {
     /**
      * @description:en-US Album Link
@@ -159,6 +194,11 @@ interface PageFrontMatter extends Record<string, any> {
      * @description 是否显示右侧侧边栏
      */
     aside: boolean;
+    /**
+     * display left sidebar
+     * @description 是否显示左侧侧边栏
+     */
+    sidebar: boolean;
     /**
      * @description:en-US Custom Markdown class
      * @description:zh-CN 自定义 Markdown 样式
@@ -214,6 +254,10 @@ interface PageFrontMatter extends Record<string, any> {
      * @description:en-US Photos
      */
     photos: Photo[];
+    /**
+     * for collections
+     */
+    collections: CollectionConfig[];
     /**
      * @description:zh-CN 是否启用加密，password 存在时默认为 true
      */
@@ -522,6 +566,14 @@ interface SiteConfig {
          * @description 搜索结果列表数据所在路径
          */
         dataPath: string;
+        /**
+         * fast-glob pattern to match Fuse List Data
+         * @default `pages\/**\/*.md`
+         * ```ts
+         * await fg(`${userRoot}/pages/posts/**\/*.md`)
+         * ```
+         */
+        pattern?: string;
         /**
          * @see https://fusejs.io/api/options.html
          */

package/dist/node/cli/index.js

@@ -3,7 +3,7 @@ import {
   registerDevCommand,
   run,
   startValaxyDev
-} from "../../chunk-5GRPXDJR.js";
+} from "../../chunk-JHXXCWZC.js";
 export {
   cli,
   registerDevCommand,

package/dist/node/index.d.ts

@@ -2,7 +2,7 @@ import { ViteSSGOptions } from 'vite-ssg';
 import * as vite from 'vite';
 import { UserConfig, InlineConfig, PluginOption, Plugin } from 'vite';
 import { MarkdownEnv } from 'unplugin-vue-markdown/types';
-import { D as DefaultTheme, V as ValaxyConfig, a as ValaxyAddon, P as PartialDeep, R as RuntimeConfig, b as RedirectItem, S as SiteConfig, U as UserSiteConfig } from '../config-DHcACRUt.js';
+import { D as DefaultTheme, V as ValaxyConfig, a as ValaxyAddon, P as PartialDeep, R as RuntimeConfig, b as RedirectItem, S as SiteConfig, U as UserSiteConfig } from '../config-bf4WqwPK.js';
 import Vue from '@vitejs/plugin-vue';
 import { Options as Options$2 } from 'beasties';
 import { Hookable } from 'hookable';

package/dist/node/index.js

@@ -50,7 +50,7 @@ import {
   startValaxyDev,
   toAtFS,
   transformObject
-} from "../chunk-5GRPXDJR.js";
+} from "../chunk-JHXXCWZC.js";
 export {
   $t,
   ALL_ROUTE,

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { c as PostFrontMatter, d as PageFrontMatter } from '../config-DHcACRUt.js';
-export { A as Album, D as DefaultTheme, E as ExcerptType, F as FuseListItem, P as PartialDeep, i as Photo, g as Pkg, b as RedirectItem, f as RedirectRule, R as RuntimeConfig, S as SiteConfig, e as SocialLink, U as UserSiteConfig, h as UserValaxyConfig, a as ValaxyAddon, V as ValaxyConfig } from '../config-DHcACRUt.js';
+import { c as PostFrontMatter, d as PageFrontMatter } from '../config-bf4WqwPK.js';
+export { A as Album, D as DefaultTheme, E as ExcerptType, F as FuseListItem, P as PartialDeep, i as Photo, g as Pkg, b as RedirectItem, f as RedirectRule, R as RuntimeConfig, S as SiteConfig, e as SocialLink, U as UserSiteConfig, h as UserValaxyConfig, a as ValaxyAddon, V as ValaxyConfig } from '../config-bf4WqwPK.js';
 import { Header } from '@valaxyjs/utils';
 import '@vueuse/integrations/useFuse';
 import 'medium-zoom';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.25.8",
+  "version": "0.25.10",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -58,7 +58,7 @@
     "@clack/prompts": "^0.11.0",
     "@iconify-json/ri": "^1.2.5",
     "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@shikijs/transformers": "^3.8.0",
+    "@shikijs/transformers": "^3.8.1",
     "@types/katex": "^0.16.7",
     "@unhead/addons": "^2.0.12",
     "@unhead/schema-org": "^2.0.12",
@@ -111,7 +111,7 @@
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
     "sass": "^1.89.2",
-    "shiki": "^3.8.0",
+    "shiki": "^3.8.1",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
     "unhead": "^2.0.12",
@@ -125,14 +125,14 @@
     "vite-plugin-vue-devtools": "^7.7.7",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-ssg": "^28.0.0",
-    "vite-ssg-sitemap": "^0.9.0",
+    "vite-ssg-sitemap": "^0.10.0",
     "vitepress-plugin-group-icons": "^1.6.1",
     "vue": "^3.5.17",
     "vue-i18n": "^11.1.10",
     "vue-router": "^4.5.1",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.25.8",
-    "@valaxyjs/utils": "0.25.8"
+    "@valaxyjs/devtools": "0.25.10",
+    "@valaxyjs/utils": "0.25.10"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",

package/shared/utils/i18n.ts

@@ -10,7 +10,7 @@
  * ```
  */
 export function tObject<T = string>(data: string | Record<string, T>, lang: string): T | string {
-  if (typeof data === 'object') {
+  if (data && typeof data === 'object') {
     return data[lang] || Object.values(data)[0] || ''
   }
   return data

package/types/config.ts

@@ -180,6 +180,14 @@ export interface SiteConfig {
      * @description 搜索结果列表数据所在路径
      */
     dataPath: string
+    /**
+     * fast-glob pattern to match Fuse List Data
+     * @default `pages\/**\/*.md`
+     * ```ts
+     * await fg(`${userRoot}/pages/posts/**\/*.md`)
+     * ```
+     */
+    pattern?: string
     /**
      * @see https://fusejs.io/api/options.html
      */

package/types/frontmatter/page.ts

@@ -1,4 +1,5 @@
 import type { ImageObject, NodeRelations } from '@unhead/schema-org'
+import type { CollectionConfig } from '../../client/define'
 
 export interface Album {
   /**
@@ -105,6 +106,11 @@ export interface PageFrontMatter extends Record<string, any> {
    * @description 是否显示右侧侧边栏
    */
   aside: boolean
+  /**
+   * display left sidebar
+   * @description 是否显示左侧侧边栏
+   */
+  sidebar: boolean
 
   /**
    * @description:en-US Custom Markdown class
@@ -155,17 +161,21 @@ export interface PageFrontMatter extends Record<string, any> {
    */
   medium_zoom: boolean
 
+  // --- layout ---
   /**
    * @description:en-US Albums
    * @description:zh-CN 相册
    */
   albums: Album[]
-
   /**
    * For layout Gallery
    * @description:en-US Photos
    */
   photos: Photo[]
+  /**
+   * for collections
+   */
+  collections: CollectionConfig[]
 
   /**
    * @description:zh-CN 是否启用加密，password 存在时默认为 true