@jet-w/astro-blog 0.1.1 → 0.1.3

package/dist/utils/sidebar.js

@@ -0,0 +1,305 @@
+// src/utils/sidebar.ts
+function buildTreeFromPosts(posts, scanPath = "", options = {}) {
+  const { maxDepth, exclude = [], include = [], sortBy = "name", sortOrder = "asc" } = options;
+  const filteredPosts = posts.filter((post) => {
+    const postPath = post.id.toLowerCase();
+    const targetPath = scanPath.toLowerCase();
+    if (targetPath && !postPath.startsWith(targetPath + "/") && postPath !== targetPath) {
+      return false;
+    }
+    const pathParts = post.id.split("/");
+    for (const part of pathParts) {
+      if (exclude.some((pattern) => matchPattern(part, pattern))) {
+        return false;
+      }
+    }
+    if (include.length > 0) {
+      const matchesInclude = pathParts.some(
+        (part) => include.some((pattern) => matchPattern(part, pattern))
+      );
+      if (!matchesInclude) {
+        return false;
+      }
+    }
+    return true;
+  });
+  const folderTitles = {};
+  const folderIcons = {};
+  filteredPosts.forEach((post) => {
+    const pathParts = post.id.split("/");
+    const fileName = pathParts[pathParts.length - 1].toLowerCase();
+    if (fileName === "readme" || fileName === "readme.md") {
+      const folderPath = pathParts.slice(0, -1).join("/");
+      if (folderPath) {
+        if (post.data.title) {
+          folderTitles[folderPath] = post.data.title;
+        }
+        if (post.data.icon) {
+          folderIcons[folderPath] = post.data.icon;
+        }
+      }
+    }
+  });
+  const tree = [];
+  filteredPosts.forEach((post) => {
+    let relativePath = post.id;
+    if (scanPath) {
+      const scanPathLower = scanPath.toLowerCase();
+      const postIdLower = post.id.toLowerCase();
+      if (postIdLower.startsWith(scanPathLower + "/")) {
+        relativePath = post.id.slice(scanPath.length + 1);
+      } else if (postIdLower === scanPathLower) {
+        relativePath = post.id.split("/").pop() || post.id;
+      }
+    }
+    const pathParts = relativePath.split("/");
+    if (maxDepth !== void 0 && pathParts.length > maxDepth) {
+      return;
+    }
+    let currentLevel = tree;
+    let currentPath = scanPath;
+    pathParts.forEach((part, index) => {
+      const isLast = index === pathParts.length - 1;
+      const existing = currentLevel.find((n) => n.name.toLowerCase() === part.toLowerCase());
+      currentPath = currentPath ? `${currentPath}/${part}` : part;
+      const isReadme = isLast && (part.toLowerCase() === "readme" || part.toLowerCase() === "readme.md");
+      if (existing) {
+        if (isLast) {
+          existing.slug = post.id;
+          existing.title = post.data.title;
+          existing.icon = post.data.icon;
+          existing.isReadme = isReadme;
+        } else {
+          const folderPath = scanPath ? `${scanPath}/${pathParts.slice(0, index + 1).join("/")}` : pathParts.slice(0, index + 1).join("/");
+          if (folderTitles[folderPath]) {
+            existing.displayName = folderTitles[folderPath];
+          }
+          if (folderIcons[folderPath]) {
+            existing.icon = folderIcons[folderPath];
+          }
+        }
+        currentLevel = existing.children;
+      } else {
+        const folderPath = scanPath ? `${scanPath}/${pathParts.slice(0, index + 1).join("/")}` : pathParts.slice(0, index + 1).join("/");
+        const newNode = {
+          name: part,
+          slug: isLast ? post.id : void 0,
+          title: isLast ? post.data.title : void 0,
+          displayName: isLast ? post.data.title : folderTitles[folderPath],
+          icon: isLast ? post.data.icon : folderIcons[folderPath],
+          children: [],
+          isFolder: !isLast,
+          isReadme
+        };
+        currentLevel.push(newNode);
+        currentLevel = newNode.children;
+      }
+    });
+  });
+  return sortTree(tree, sortBy, sortOrder);
+}
+function sortTree(nodes, sortBy = "name", sortOrder = "asc") {
+  const filtered = nodes.filter((node) => !node.isReadme);
+  const sorted = filtered.sort((a, b) => {
+    if (a.isFolder && !b.isFolder) return -1;
+    if (!a.isFolder && b.isFolder) return 1;
+    let comparison = 0;
+    switch (sortBy) {
+      case "title":
+        comparison = (a.displayName || a.title || a.name).localeCompare(
+          b.displayName || b.title || b.name,
+          "zh-CN"
+        );
+        break;
+      case "name":
+      default:
+        comparison = a.name.localeCompare(b.name, "zh-CN", { numeric: true });
+        break;
+    }
+    return sortOrder === "desc" ? -comparison : comparison;
+  });
+  return sorted.map((node) => ({
+    ...node,
+    children: sortTree(node.children, sortBy, sortOrder)
+  }));
+}
+function matchPattern(str, pattern) {
+  if (pattern === "*") return true;
+  if (pattern.includes("*")) {
+    const regex = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$", "i");
+    return regex.test(str);
+  }
+  return str.toLowerCase() === pattern.toLowerCase();
+}
+function matchPathPattern(currentPath, pattern) {
+  const normalizedPath = currentPath.replace(/\/$/, "").toLowerCase();
+  const normalizedPattern = pattern.replace(/\/$/, "").toLowerCase();
+  if (normalizedPattern.endsWith("/**")) {
+    const basePath = normalizedPattern.slice(0, -3);
+    return normalizedPath === basePath || normalizedPath.startsWith(basePath + "/");
+  }
+  if (normalizedPattern.endsWith("/*")) {
+    const basePath = normalizedPattern.slice(0, -2);
+    if (normalizedPath === basePath) return true;
+    if (normalizedPath.startsWith(basePath + "/")) {
+      const remaining = normalizedPath.slice(basePath.length + 1);
+      return !remaining.includes("/");
+    }
+    return false;
+  }
+  return normalizedPath === normalizedPattern;
+}
+function shouldShowGroup(group, currentPath) {
+  if (!group.showForPaths && !group.hideForPaths) {
+    return true;
+  }
+  if (group.hideForPaths && group.hideForPaths.length > 0) {
+    for (const pattern of group.hideForPaths) {
+      if (matchPathPattern(currentPath, pattern)) {
+        return false;
+      }
+    }
+  }
+  if (group.showForPaths && group.showForPaths.length > 0) {
+    for (const pattern of group.showForPaths) {
+      if (matchPathPattern(currentPath, pattern)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  return true;
+}
+function filterGroupsByPath(groups, currentPath) {
+  return groups.filter((group) => shouldShowGroup(group, currentPath));
+}
+function manualItemsToTree(items) {
+  return items.map((item) => ({
+    name: item.title,
+    slug: item.slug,
+    title: item.title,
+    displayName: item.title,
+    icon: item.icon,
+    badge: item.badge,
+    badgeType: item.badgeType,
+    link: item.link,
+    children: item.children ? manualItemsToTree(item.children) : [],
+    isFolder: !!(item.children && item.children.length > 0),
+    collapsed: item.collapsed
+  }));
+}
+async function processSidebarConfig(config, posts) {
+  const processedGroups = [];
+  for (const group of config.groups) {
+    const processed = await processGroup(group, posts);
+    if (processed) {
+      processedGroups.push(processed);
+    }
+  }
+  return processedGroups;
+}
+async function processGroup(group, posts) {
+  switch (group.type) {
+    case "scan": {
+      const scanConfig = group;
+      const tree = buildTreeFromPosts(posts, scanConfig.scanPath, {
+        maxDepth: scanConfig.maxDepth,
+        exclude: scanConfig.exclude,
+        include: scanConfig.include,
+        sortBy: scanConfig.sortBy,
+        sortOrder: scanConfig.sortOrder
+      });
+      return {
+        type: "tree",
+        title: scanConfig.title,
+        icon: scanConfig.icon,
+        collapsed: scanConfig.collapsed,
+        tree
+      };
+    }
+    case "manual": {
+      const manualConfig = group;
+      const tree = manualItemsToTree(manualConfig.items);
+      return {
+        type: "tree",
+        title: manualConfig.title,
+        icon: manualConfig.icon,
+        collapsed: manualConfig.collapsed,
+        tree
+      };
+    }
+    case "mixed": {
+      const mixedConfig = group;
+      const combinedTree = [];
+      for (const section of mixedConfig.sections) {
+        const processed = await processGroup(section, posts);
+        if (processed && processed.tree) {
+          combinedTree.push({
+            name: section.title,
+            displayName: section.title,
+            icon: section.icon,
+            children: processed.tree,
+            isFolder: true,
+            collapsed: section.collapsed
+          });
+        }
+      }
+      return {
+        type: "tree",
+        title: mixedConfig.title,
+        icon: mixedConfig.icon,
+        collapsed: mixedConfig.collapsed,
+        tree: combinedTree
+      };
+    }
+    case "divider": {
+      return {
+        type: "divider",
+        title: group.title || ""
+      };
+    }
+    default:
+      return null;
+  }
+}
+function getRecentPosts(posts, count = 5) {
+  return posts.filter((p) => p.data.pubDate).sort((a, b) => (b.data.pubDate?.getTime() ?? 0) - (a.data.pubDate?.getTime() ?? 0)).slice(0, count);
+}
+function getPopularTags(posts, count = 8) {
+  const tagCounts = {};
+  posts.forEach((post) => {
+    (post.data.tags || []).forEach((tag) => {
+      tagCounts[tag] = (tagCounts[tag] || 0) + 1;
+    });
+  });
+  return Object.entries(tagCounts).sort((a, b) => b[1] - a[1]).slice(0, count).map(([name, count2]) => ({
+    name,
+    count: count2,
+    slug: name.toLowerCase().replace(/\s+/g, "-")
+  }));
+}
+function getArchives(posts, count = 6) {
+  const archiveMap = {};
+  posts.forEach((post) => {
+    if (post.data.pubDate) {
+      const date = new Date(post.data.pubDate);
+      const key = `${date.getFullYear()}-${date.getMonth() + 1}`;
+      archiveMap[key] = (archiveMap[key] || 0) + 1;
+    }
+  });
+  return Object.entries(archiveMap).sort((a, b) => b[0].localeCompare(a[0])).slice(0, count).map(([key, count2]) => {
+    const [year, month] = key.split("-").map(Number);
+    return { year, month, count: count2 };
+  });
+}
+export {
+  buildTreeFromPosts,
+  filterGroupsByPath,
+  getArchives,
+  getPopularTags,
+  getRecentPosts,
+  manualItemsToTree,
+  matchPathPattern,
+  processSidebarConfig,
+  shouldShowGroup
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jet-w/astro-blog",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A modern Astro blog theme with Vue and Tailwind CSS support",
   "type": "module",
   "exports": {
@@ -20,7 +20,10 @@
     "./styles/*": "./src/styles/*",
     "./components/*": "./src/components/*",
     "./layouts/*": "./src/layouts/*",
-    "./utils/*": "./src/utils/*"
+    "./utils/sidebar": {
+      "types": "./dist/utils/sidebar.d.ts",
+      "import": "./dist/utils/sidebar.js"
+    }
   },
   "files": [
     "dist",
@@ -28,7 +31,7 @@
     "src/styles",
     "src/components",
     "src/layouts",
-    "src/utils",
+    "src/pages",
     "templates"
   ],
   "scripts": {

package/src/components/about/SocialLinks.astro

@@ -16,7 +16,7 @@ import {
   socialLinks as configSocialLinks,
   defaultIcons,
   type SocialLink
-} from '../../config';
+} from '@jet-w/astro-blog/config';
 
 export interface Props {
   links?: SocialLink[];

package/src/components/blog/Hero.astro

@@ -1,5 +1,5 @@
 ---
-import { siteConfig } from '../../config/site';
+import { siteConfig } from '@jet-w/astro-blog/config';
 ---
 
 <section class="py-16 mb-16">

package/src/components/layout/Footer.astro

@@ -1,6 +1,5 @@
 ---
-import { siteConfig } from '../../config/site';
-import { footerConfig, defaultIcons } from '../../config';
+import { siteConfig, footerConfig, defaultIcons } from '@jet-w/astro-blog/config';
 
 const currentYear = new Date().getFullYear();
 

package/src/components/layout/Header.astro

@@ -1,8 +1,8 @@
 ---
-import { siteConfig } from '../../config/site';
-import ThemeToggle from '../../components/ui/ThemeToggle.vue';
-import SearchBox from '../../components/ui/SearchBox.vue';
-import MobileMenu from '../../components/ui/MobileMenu.vue';
+import { siteConfig } from '@jet-w/astro-blog/config';
+import ThemeToggle from '../ui/ThemeToggle.vue';
+import SearchBox from '../ui/SearchBox.vue';
+import MobileMenu from '../ui/MobileMenu.vue';
 
 const currentPath = Astro.url.pathname;
 ---

package/src/components/layout/Sidebar.astro

@@ -1,14 +1,14 @@
 ---
 import { getCollection } from 'astro:content';
-import Icon from '../../components/ui/Icon.astro';
-import { sidebarConfig } from '../../config/sidebar';
+import Icon from '../ui/Icon.astro';
+import { sidebarConfig } from '@jet-w/astro-blog/config';
 import {
   processSidebarConfig,
   getRecentPosts,
   getPopularTags,
   getArchives,
   filterGroupsByPath,
-} from '../../utils/sidebar';
+} from '@jet-w/astro-blog/utils/sidebar';
 
 interface Props {
   currentPath?: string;

package/src/components/ui/MobileMenu.vue

@@ -99,7 +99,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue'
-import type { NavigationItem } from '../../types'
+import type { NavigationItem } from '@jet-w/astro-blog/types'
 import SearchBox from './SearchBox.vue'
 import ThemeToggle from './ThemeToggle.vue'
 

package/src/components/ui/SearchInterface.vue

@@ -196,7 +196,7 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import type { SearchResult } from '../../types'
+import type { SearchResult } from '@jet-w/astro-blog/types'
 
 const searchQuery = ref('')
 const selectedTag = ref('')

package/src/layouts/BaseLayout.astro

@@ -1,7 +1,7 @@
 ---
-import type { SEOProps } from '../types';
-import { siteConfig, defaultSEO } from '../config/site';
-import '../styles/global.css';
+import type { SEOProps } from '@jet-w/astro-blog/types';
+import { siteConfig, defaultSEO } from '@jet-w/astro-blog/config';
+import '@jet-w/astro-blog/styles/global.css';
 import fs from 'node:fs';
 import path from 'node:path';
 

package/src/layouts/SlidesLayout.astro

@@ -1,6 +1,6 @@
 ---
-import { siteConfig } from '../config/site';
-import '../styles/slides.css';
+import { siteConfig } from '@jet-w/astro-blog/config';
+import '@jet-w/astro-blog/styles/slides.css';
 
 export interface Props {
   title: string;

package/{templates/default/src → src}/pages/rss.xml.ts

@@ -1,6 +1,6 @@
 import rss from '@astrojs/rss';
 import { getCollection } from 'astro:content';
-import { siteConfig } from '@/config';
+import { siteConfig } from '@jet-w/astro-blog/config';
 
 export async function GET(context: { site: URL }) {
   const posts = await getCollection('posts', ({ data }) => !data.draft);

package/templates/default/astro.config.mjs

@@ -7,7 +7,8 @@ import remarkMath from 'remark-math';
 import rehypeKatex from 'rehype-katex';
 import rehypeRaw from 'rehype-raw';
 
-// Import plugins from @jet-w/astro-blog
+// Import plugins and integration from @jet-w/astro-blog
+import { astroBlog } from '@jet-w/astro-blog';
 import { remarkContainers } from '@jet-w/astro-blog/plugins/remark-containers.mjs';
 import { remarkMermaid } from '@jet-w/astro-blog/plugins/remark-mermaid.mjs';
 import { rehypeCleanContainers } from '@jet-w/astro-blog/plugins/rehype-clean-containers.mjs';
@@ -17,6 +18,7 @@ import { rehypeRelativeLinks } from '@jet-w/astro-blog/plugins/rehype-relative-l
 // https://astro.build/config
 export default defineConfig({
   integrations: [
+    astroBlog(),
     vue(),
     mdx(),
     tailwind({

package/templates/default/src/config/footer.ts

@@ -0,0 +1,31 @@
+/**
+ * Footer Configuration
+ *
+ * Configure footer links, copyright, and display options
+ */
+
+import type { FooterConfig } from '@jet-w/astro-blog';
+import { socialLinks } from './social';
+
+/**
+ * Footer configuration
+ */
+export const footerConfig: FooterConfig = {
+  quickLinksTitle: '快速链接',
+  quickLinks: [
+    { name: '首页', href: '/' },
+    { name: '文章', href: '/posts' },
+    { name: '标签', href: '/tags' },
+    { name: '归档', href: '/archives' },
+    { name: '关于', href: '/about' }
+  ],
+  contactTitle: '联系方式',
+  socialLinks: socialLinks,
+  showRss: true,
+  rssUrl: '/rss.xml',
+  copyright: '© {year} {author}. All rights reserved.',
+  poweredBy: {
+    text: 'Astro',
+    url: 'https://astro.build'
+  }
+};

package/templates/default/src/config/index.ts

@@ -1,114 +1,17 @@
 /**
- * Blog configuration
+ * Blog Configuration
  *
- * Customize your blog settings here
- */
-
-import type { SiteConfig, NavigationItem } from '@jet-w/astro-blog';
-import type { SidebarConfig, FooterConfig, SocialLink } from '@jet-w/astro-blog';
-
-/**
- * Site configuration
- */
-export const siteConfig: SiteConfig = {
-  title: 'My Astro Blog',
-  description: '基于 Astro + Vue + Tailwind 构建的个人技术博客',
-  author: 'Author',
-  email: 'email@example.com',
-  avatar: '/images/avatar.svg',
-  social: {
-    github: 'https://github.com/username',
-    twitter: '',
-    linkedin: '',
-    email: 'mailto:email@example.com'
-  },
-  menu: [
-    {
-      name: '首页',
-      href: '/',
-      icon: 'home'
-    },
-    {
-      name: '博客教学',
-      href: '/posts/blog_docs',
-      icon: 'posts'
-    },
-    {
-      name: '演示',
-      href: '/slides',
-      icon: 'slides'
-    },
-    {
-      name: '关于',
-      href: '/about',
-      icon: 'about'
-    }
-  ]
-};
-
-/**
- * Default SEO settings
- */
-export const defaultSEO = {
-  title: siteConfig.title,
-  description: siteConfig.description,
-  image: '/images/og-image.jpg',
-  type: 'website' as const
-};
-
-/**
- * Sidebar configuration
- */
-export const sidebarConfig: SidebarConfig = {
-  enabled: true,
-  showSearch: true,
-  showRecentPosts: true,
-  recentPostsCount: 5,
-  showPopularTags: true,
-  popularTagsCount: 8,
-  showArchives: true,
-  archivesCount: 6,
-  showFriendLinks: false,
-  friendLinks: [],
-  groups: [
-    {
-      type: 'scan',
-      title: '博客指南',
-      icon: 'ri:book-open-line',
-      scanPath: 'blog_docs',
-      collapsed: true,
-      showForPaths: ['/posts/blog_docs/**']
-    }
-  ]
-};
-
-/**
- * Social links
+ * This file re-exports all configuration modules for easy access.
+ * Each configuration is in its own file for better organization:
+ *
+ * - site.ts    : Site title, description, author, menu
+ * - sidebar.ts : Sidebar display options and groups
+ * - social.ts  : Social media links
+ * - footer.ts  : Footer links and copyright
  */
-export const socialLinks: SocialLink[] = [
-  { type: 'github', url: 'https://github.com/username', label: 'GitHub' },
-  { type: 'email', url: 'mailto:email@example.com', label: 'Email' }
-];
 
-/**
- * Footer configuration
- */
-export const footerConfig: FooterConfig = {
-  quickLinksTitle: '快速链接',
-  quickLinks: [
-    { name: '首页', href: '/' },
-    { name: '文章', href: '/posts' },
-    { name: '标签', href: '/tags' },
-    { name: '归档', href: '/archives' },
-    { name: '关于', href: '/about' }
-  ],
-  contactTitle: '联系方式',
-  socialLinks: socialLinks,
-  showRss: true,
-  rssUrl: '/rss.xml',
-  copyright: '© {year} {author}. All rights reserved.',
-  poweredBy: {
-    text: 'Astro',
-    url: 'https://astro.build'
-  }
-};
+// Re-export all configurations
+export { siteConfig, defaultSEO } from './site';
+export { sidebarConfig } from './sidebar';
+export { socialLinks } from './social';
+export { footerConfig } from './footer';

package/templates/default/src/config/sidebar.ts

@@ -0,0 +1,33 @@
+/**
+ * Sidebar Configuration
+ *
+ * Configure sidebar display options, groups, and widgets
+ */
+
+import type { SidebarConfig } from '@jet-w/astro-blog';
+
+/**
+ * Sidebar configuration
+ */
+export const sidebarConfig: SidebarConfig = {
+  enabled: true,
+  showSearch: true,
+  showRecentPosts: true,
+  recentPostsCount: 5,
+  showPopularTags: true,
+  popularTagsCount: 8,
+  showArchives: true,
+  archivesCount: 6,
+  showFriendLinks: false,
+  friendLinks: [],
+  groups: [
+    {
+      type: 'scan',
+      title: '博客指南',
+      icon: 'ri:book-open-line',
+      scanPath: 'blog_docs',
+      collapsed: true,
+      showForPaths: ['/posts/blog_docs/**']
+    }
+  ]
+};