hexo-theme-stellar 1.28.0 → 1.29.0

package/layout/_partial/main/notebook/paginator.ejs

@@ -0,0 +1,9 @@
+<% if ((page.total || 0) > 1) { %>
+  <div class="paginator-wrap dis-select<%= scrollreveal(' ') %>">
+    <%- paginator({
+      prev_text: '',
+      next_text: '',
+      force_prev_next: true,
+    }) %>
+  </div>
+<% } %>

package/layout/_partial/scripts/tagtree.ejs

@@ -0,0 +1,29 @@
+<script type="text/javascript">
+  (() => {
+    const tagSwitchers = document.querySelectorAll('.tag-subtree.parent-tag > a > .tag-switcher-wrapper')
+    for (const tagSwitcher of tagSwitchers) {
+      tagSwitcher.addEventListener('click', (e) => {
+        const parent = e.target.closest('.tag-subtree.parent-tag')
+        parent.classList.toggle('expanded')
+        e.preventDefault()
+      })
+    }
+
+    // Get active tag from query string, then activate it.
+    const urlParams = new URLSearchParams(window.location.search)
+    const activeTag = urlParams.get('tag')
+    if (activeTag) {
+      let tag = document.querySelector(`.tag-subtree[data-tag="${activeTag}"]`)
+      if (tag) {
+        tag.querySelector('a').classList.add('active')
+        <% if (!theme.widgets.tagtree.expand_active) { %>
+          tag = tag.parentElement.closest('.tag-subtree.parent-tag')
+        <% } %>
+        while (tag) {
+          tag.classList.add('expanded')
+          tag = tag.parentElement.closest('.tag-subtree.parent-tag')
+        }
+      }
+    }
+  })()
+</script>

package/layout/_partial/scripts/theme.ejs

@@ -0,0 +1,62 @@
+<script type="text/javascript">
+  const applyTheme = (theme) => {
+    if (theme === 'auto') {
+      document.documentElement.removeAttribute('data-theme')
+    } else {
+      document.documentElement.setAttribute('data-theme', theme)
+    }
+
+    applyThemeToGiscus(theme)
+  }
+
+  const applyThemeToGiscus = (theme) => {
+    theme = theme === 'auto' ? 'preferred_color_scheme' : theme
+
+    const cmt = document.getElementById('giscus')
+    if (cmt) {
+      // This works before giscus load.
+      cmt.setAttribute('data-theme', theme)
+    }
+
+    const iframe = document.querySelector('#comments > section.giscus > iframe')
+    if (iframe) {
+      // This works after giscus loaded.
+      const src = iframe.src
+      const newSrc = src.replace(/theme=[\w]+/, `theme=${theme}`)
+      iframe.src = newSrc
+    }
+  }
+
+  const switchTheme = () => {
+    // light -> dark -> auto -> light -> ...
+    const currentTheme = document.documentElement.getAttribute('data-theme')
+    let newTheme;
+    switch (currentTheme) {
+      case 'light':
+        newTheme = 'dark'
+        break
+      case 'dark':
+        newTheme = 'auto'
+        break
+      default:
+        newTheme = 'light'
+    }
+    applyTheme(newTheme)
+    window.localStorage.setItem('Stellar.theme', newTheme)
+
+    const messages = {
+      light: `<%- __('message.theme_switched.light') %>`,
+      dark: `<%- __('message.theme_switched.dark') %>`,
+      auto: `<%- __('message.theme_switched.auto') %>`,
+    }
+    hud?.toast?.(messages[newTheme])
+  }
+
+  (() => {
+    // Apply user's preferred theme, if any.
+    const theme = window.localStorage.getItem('Stellar.theme')
+    if (theme !== null) {
+      applyTheme(theme)
+    }
+  })()
+</script>

package/layout/_partial/scripts.ejs

@@ -18,9 +18,12 @@ function custom_inject() {
 <%- partial('scripts/defines') %>
 <%- partial('scripts/utils') %>
 <%- partial('scripts/sidebar') %>
+<%- partial('scripts/tagtree') %>
 
 <!-- required -->
-<script src="<%- `${theme.stellar.main_js}?v=${stellar_info('version')}` %>" async></script>
+<script src="<%- `${theme.stellar.main_js}?v=${stellar_info('version')}` %>" defer></script>
+
+<%- partial('scripts/theme') %>
 
 <!-- optional -->
 <%- partial('comments/script') %>

package/layout/_partial/sidebar/index_leftbar.ejs

@@ -2,12 +2,22 @@
 
 const wiki = theme.wiki.tree[page.wiki]
 const topic = theme.topic.tree[page.topic]
+const notebook = theme.notebooks.tree[page.notebook]
 
 if (page.leftbar == null) {
   const { site_tree } = theme
   var sidebar
   if (is_home()) {
     sidebar = site_tree.home.leftbar
+  } else if (page.layout === 'notebooks') {
+    // 笔记本列表页
+    sidebar = site_tree.notebooks.leftbar
+  } else if (page.layout === 'notes') {
+    // 笔记列表页
+    sidebar = notebook ? notebook.leftbar : site_tree.notes.leftbar
+  } else if (notebook) {
+    // 笔记本文章内页
+    sidebar = page.leftbar ?? notebook.note_leftbar
   } else if (is_category() || is_tag() || is_archive() || ['categories', 'tags', 'archives'].includes(page.layout)) {
     sidebar = site_tree.index_blog.leftbar
   } else if (page.layout === 'index_topic') {

package/layout/_partial/sidebar/index_rightbar.ejs

@@ -2,12 +2,22 @@
 
 const wiki = theme.wiki.tree[page.wiki]
 const topic = theme.topic.tree[page.topic]
+const notebook = theme.notebooks.tree[page.notebook]
 
 if (page.rightbar == null) {
   const { site_tree } = theme
   var sidebar
   if (is_home()) {
     sidebar = site_tree.home.rightbar
+  } else if (page.layout === 'notebooks') {
+    // 笔记本列表页
+    sidebar = site_tree.notebooks.rightbar
+  } else if (page.layout === 'notes') {
+    // 笔记列表页
+    sidebar = notebook ? notebook.rightbar : site_tree.notes.rightbar
+  } else if (notebook) {
+    // 笔记本文章内页
+    sidebar = page.rightbar ?? notebook.note_rightbar
   } else if (is_category() || is_tag() || is_archive() || ['categories', 'tags', 'archives'].includes(page.layout)) {
     sidebar = site_tree.index_blog.rightbar
   } else if (page.layout === 'index_topic') {

package/layout/_partial/sidebar/search.ejs

@@ -1,10 +1,14 @@
 <%
+const notebook = theme.notebooks.tree[page.notebook]
 if (item.filter == null) {
   item.filter = 'auto'
 }
 if (item.placeholder == null && item.filter == 'auto') {
   if (theme.wiki.tree[page.wiki]?.name) {
     item.placeholder = __('search.search_in', theme.wiki.tree[page.wiki]?.name) 
+  } else if (notebook) {
+    item.placeholder = __('search.search_in', notebook.name || __('btn.notebook'))
+    item.filter = notebook.base_dir
   }
 }
 function layoutDiv() {

package/layout/_partial/widgets/recent.ejs

@@ -21,6 +21,10 @@ function layoutDiv() {
       return false
     })
     arr = arr.sort((p1, p2) => p1.updated > p2.updated ? -1 : 1)
+  } else if (page.layout === 'notebooks') {
+    arr = site.pages.filter(p => p.notebook).sort('-updated')
+  } else if (page.notebook) {
+    arr = site.pages.filter(p => p.notebook === page.notebook).sort('-updated')
   } else {
     arr = site.posts.filter( p => p.title && p.title.length > 0)
     arr = arr.sort("updated", -1)
@@ -38,6 +42,12 @@ function layoutDiv() {
       if (name) {
         el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';
       }
+    } else if (page.layout === 'notebooks') {
+      const notebook = theme.notebooks.tree[post.notebook]
+      const name = notebook?.name || post.notebook
+      if (name) {
+        el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';
+      }
     }
     el += post.title + '</span>';
     el += '</a>';

package/layout/_partial/widgets/tagtree.ejs

@@ -0,0 +1,59 @@
+<%# 笔记本的标签树 %>
+<% const notebook = theme.notebooks.tree[page.notebook] %>
+<% const tagTree = notebook?.tagTree %>
+<% const isLeaf = tag => tag.id === '' || tag.children.length === 0 %>
+<% const getTagcon = tag => {
+  const tagcons = theme.notebook.tagcons || {}
+  return tagcons[tag.name] || tagcons[tag.id] || tagcons[tag.part] || tagcons[tag.part.toLowerCase()] || tagcons['']
+} %>
+
+<% function layoutTag(tag, level) { %>
+  <% const active = page.activeTag === tag.id %>
+  <a class="link<%= active ? ' active' : '' %>" href="<%= url_for(tag.path) %>">
+    <span class="toc-text"<% if (level > 0) { %> style="padding-left: <%= level * 0.875 %>rem;"<% } %>>
+      <% if (tag.id === '') { %>
+        <%= __('meta.all_notes') %>
+      <% } else { %>
+        <% const tagcon = item.show_tagcon && getTagcon(tag) %>
+        <% if (tagcon) { %><span class="tagcon"><%- icon(tagcon) %></span><% } %>
+        <%= tag.part %>
+      <% } %>
+    </span>
+    <span class="toc-text tag-switcher-wrapper">
+      <span class="tag-switcher" />
+    </span>
+  </a>
+<% } %>
+
+<% function layoutChildTags(tag, level) { %>
+  <% for (const child of tag.children) { %>
+    <%= tagAndSub(tagTree.get(child), level + 1) %>
+  <% } %>
+<% } %>
+
+<% function tagAndSub(tag, level) { %>
+  <% if (!tag) return '' %>
+  <% const active = page.activeTag === tag.id %>
+  <% const expanded = item.expand_all || (item.expand_active && active) || page.activeTag?.startsWith(`${tag.id}/`) %>
+  <% const classes = [isLeaf(tag) ? ' leaf-tag' : ' parent-tag', expanded ? ' expanded' : ''] %>
+  <div class="tag-subtree<%= classes.join('') %>" data-tag="<%= tag.id %>">
+    <%= layoutTag(tag, level) %>
+    <% if (!isLeaf(tag)) { %>
+      <%= layoutChildTags(tag, level) %>
+    <% } %>
+  </div>
+<% } %>
+
+<% if (tagTree) { %>
+  <widget class="widget-wrapper<%= scrollreveal(' ') %> post-list">
+    <div class="widget-header dis-select">
+      <span class="name"><%= __('meta.tag_tree') %></span>
+    </div>
+    <div class="widget-body fs14 tag-tree">
+      <%= tagAndSub(tagTree.get(''), 0) %>
+      <% for (const child of tagTree.get('').children) { %>
+        <%= tagAndSub(tagTree.get(child), 0) %>
+      <% } %>
+    </div>
+  </widget>
+<% } %>

package/layout/_partial/widgets/toc.ejs

@@ -55,11 +55,13 @@ function layoutDiv(fallback) {
   el += icon('default:upup')
   el += `<span>${__('btn.top')}</span>`
   el += `</a>`
-  if (page.comments) {
-    el += `<a class="buttom" onclick="util.scrollComment()">`
-    el += icon('default:tocomment')
-    el += `<span>${__('btn.comments')}</span>`
-    el += `</a>`
+  if (theme.comments.service && theme.comments.service.length > 0) {
+    if (page.comments == undefined || page.comments != false) {
+      el += `<a class="buttom" onclick="util.scrollComment()">`
+      el += icon('default:tocomment')
+      el += `<span>${__('btn.comments')}</span>`
+      el += `</a>`
+    }
   }
   el += `</div>`
   el += `</widget>`

package/layout/_plugins/fancybox.ejs

@@ -24,9 +24,9 @@
           autoStart: false,
         },
         caption: (fancybox, slide) => {
-          return slide.triggerEl.alt || null
+          return slide.triggerEl.alt || slide.triggerEl.dataset.caption || null
         }
       });
     })
   }
-</script>
+</script>

package/layout/_plugins/tianli_gpt.ejs

@@ -1,6 +1,6 @@
 <% 
 const { field } = theme.plugins.tianli_gpt;
-const matchesField = field === 'all' || field === layout || (field === 'wiki' && page.wiki) || (field === 'topic' && page.topic);
+const matchesField = field === 'all' || field === page.layout || (field === 'wiki' && page.wiki) || (field === 'topic' && page.topic);
 if (matchesField) { %>
   <script defer src="<%- theme.plugins.tianli_gpt?.js %>"></script>
   <script defer>

package/layout/layout.ejs

@@ -37,7 +37,11 @@ if (theme.style.site && theme.style.site['background-image']) {
 }
 
 var html = `<!DOCTYPE html>`
-html += `<html lang="${page.lang}">`
+if (theme.style.prefers_theme === 'auto') {
+    html += `<html lang="${page.lang}">`
+} else {
+  html += `<html lang="${page.lang}" data-theme="${theme.style.prefers_theme}">`
+}
   html += partial('_partial/head')
   html += `<body>`
     html += site_background

package/layout/notebooks.ejs

@@ -0,0 +1,8 @@
+<%# 笔记本列表页主体部分 %>
+<% for (const notebook of Object.values(theme.notebooks.tree)) { %>
+  <div class="post-list wiki">
+    <a class="post-card wiki<%= scrollreveal(' ') %>" href="<%= url_for(notebook.base_dir) %>">
+      <%- include('_partial/main/notebook/notebook_card', { notebook: notebook }) %>
+    </a>
+  </div>
+<% } %>

package/layout/notes.ejs

@@ -0,0 +1,12 @@
+<%# 笔记列表页主体部分 %>
+<div class="post-list post">
+  <% page.posts.each(post => { %>
+    <a
+      class="post-card<%= scrollreveal(' ') %> post"
+      href="<%= url_for(post.link || post.path) %><%= page.activeTag ? `?tag=${page.activeTag}` : '' %>"
+    >
+      <%- include('_partial/main/notebook/note_card', { note: post }) %>
+    </a>
+  <% }) %>
+</div>
+<%- include('_partial/main/notebook/paginator') %>

package/layout/page.ejs

@@ -3,6 +3,13 @@ const { layout } = page
 // 是否使用 Heti 布局插件
 const isUsingHeti = theme.plugins.heti?.enable
 
+const notebook = theme.notebooks.tree[page.notebook]
+if (notebook) {
+    page.menu_id ??= notebook.menu_id
+    page.license ??= notebook.license
+    page.share ??= notebook.share
+}
+
 // 默认的 menu_id
 if (page.menu_id == null) {
   if (page.wiki?.length > 0) {
@@ -40,7 +47,10 @@ function layoutDiv() {
   if (page.content && page.content.length > 0) {
     el += page.content
   }
-  if (layout === 'post') {
+  if (notebook) {
+    el += partial('_partial/main/notebook/note_tags', { notebook: notebook })
+  }
+  if (layout === 'post' || page.wiki || notebook) {
     el += partial('_partial/main/article/article_footer')
   }
   el += `</article>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/events/index.js

@@ -10,6 +10,7 @@ hexo.on('generateBefore', () => {
   require('./lib/doc_tree')(hexo);
   require('./lib/topic_tree')(hexo);
   require('./lib/utils')(hexo);
+  require('./lib/notebooks')(hexo);
 });
 
 hexo.on('generateAfter', () => {

package/scripts/events/lib/notebooks.js

@@ -0,0 +1,153 @@
+/**
+ * notebooks.js v1
+ */
+
+'use strict'
+
+class NotePage {
+  constructor(page) {
+    this.id = page._id
+    this.notebook = page.notebook
+    this.title = page.title
+    this.tags = page.tags
+    this.path = page.path
+    this.path_key = page.path.replace('.html', '')
+    this.layout = page.layout
+    this.date = page.date
+    this.updated = page.updated || page.date
+
+    const pin = page.pin ?? page.sticky ?? 0
+    if (pin === true) {
+      this.pin = 1
+    } else if (pin === false) {
+      this.pin = 0
+    } else {
+      this.pin = pin
+    }
+  }
+}
+
+function splitTag(tag) {
+  return tag.split('/').filter(t => t.length > 0)
+}
+
+function prepareNotebook(id, info, ctx) {
+  const notebook = info
+  notebook.id = id
+
+  if (notebook.base_dir) {
+    if (notebook.base_dir.startsWith('/')) {
+      notebook.base_dir = notebook.base_dir.substring(1)
+    }
+    if (notebook.base_dir.endsWith('/')) {
+      notebook.base_dir = notebook.base_dir.substring(0, notebook.base_dir.length - 1)
+    }
+  } else {
+    const notebooksBaseDir = ctx.theme.config.site_tree.notebooks.base_dir
+    notebook.base_dir = notebooksBaseDir ? `${notebooksBaseDir}/${id}` : id
+  }
+
+  notebook.sort ||= 0
+  notebook.auto_excerpt ||= ctx.theme.config.notebook.auto_excerpt || 0
+  notebook.per_page ??= ctx.theme.config.notebook.per_page ?? ctx.config.per_page ?? 10
+  notebook.order_by ||= ctx.theme.config.notebook.order_by || '-updated'
+  notebook.menu_id ??= ctx.theme.config.site_tree.notes.menu_id
+  notebook.license ??= ctx.theme.config.notebook.license
+  notebook.share ??= ctx.theme.config.notebook.share
+
+  notebook.leftbar ??= ctx.theme.config.site_tree.notes.leftbar
+  notebook.rightbar ??= ctx.theme.config.site_tree.notes.rightbar
+  notebook.note_leftbar ??= ctx.theme.config.site_tree.note.leftbar
+  notebook.note_rightbar ??= ctx.theme.config.site_tree.note.rightbar
+
+  const tagMap = new Map() // tagId: tagInfo
+  notebook.tagTree = tagMap
+
+  const rootTag = {
+    id: '',
+    name: '',
+    part: '',
+    path: notebook.base_dir,
+    parent: null, // parent tag id
+    childSet: new Set(), // child tag ids
+    noteSet: new Set(), // note ids
+  }
+  tagMap.set(rootTag.id, rootTag)
+
+  // Iterate through all notes in the notebook, build the tag tree.
+  const allPages = ctx.locals.get('pages')
+  const pages = allPages.filter(p => p.notebook === notebook.id)
+  for (const page of pages.data) {
+    rootTag.noteSet.add(page._id)
+
+    if (!page.tags) {
+      continue
+    }
+
+    for (const hierarchyTag of page.tags) {
+      const parts = splitTag(hierarchyTag)
+      let parent = rootTag
+      for (const part of parts) {
+        const tagName = parent.name ? `${parent.name}/${part}` : part
+        const tagId = tagName.toLowerCase()
+        let tag = tagMap.get(tagId)
+        if (tag == null) {
+          tag = {
+            id: tagId,
+            name: tagName,
+            part: part,
+            path: `${notebook.base_dir}/tags/${tagId}`,
+            parent: parent.id,
+            childSet: new Set(),
+            noteSet: new Set(),
+          }
+          tagMap.set(tagId, tag)
+          parent.childSet.add(tagId)
+        }
+
+        tag.noteSet.add(page._id)
+        parent = tag
+      }
+    }
+  }
+
+  notebook.noteMap = pages.map(p => new NotePage(p)).reduce((map, note) => {
+    map.set(note.id, note)
+    return map
+  }, new Map())
+
+  // Sort child tags for each tag.
+  for (const [_, tag] of tagMap) {
+    tag.children = Array.from(tag.childSet)
+    tag.children.sort()
+  }
+
+  return notebook
+}
+
+function getNotebooksObject(ctx) {
+  const notebooks = {
+    tree: {},
+  }
+
+  const data = ctx.locals.get('data')
+  const list = []
+  for (const [key, info] of Object.entries(data)) {
+    if (!key.startsWith('notebooks/') || key.endsWith('.DS_Store')) {
+      continue
+    }
+    const id = key.substring(10)
+    list.push(prepareNotebook(id, info, ctx))
+  }
+  list.sort((a, b) => a.sort - b.sort)
+  for (const info of list) {
+    notebooks.tree[info.id] = info
+  }
+
+  return notebooks
+}
+
+module.exports = ctx => {
+  const notebooks = getNotebooksObject(ctx)
+  ctx.theme.config.notebooks = notebooks
+}

package/scripts/generators/notebooks.js

@@ -0,0 +1,71 @@
+/**
+ * notebooks v1
+ */
+const pagination = require('hexo-pagination')
+
+function paginationWithEmpty(base, posts, options={}) {
+  const { layout, data = {} } = options
+  if (posts.length === 0) {
+    base = `${base}/`
+    return [{
+      path: base,
+      layout: layout,
+      data: {
+        ...data,
+        base: base,
+        total: 1,
+        current: 1,
+        current_url: base,
+        posts: posts,
+        prev: 0,
+        prev_link: '',
+        next: 0,
+        next_link: '',
+      }
+    }]
+  } else {
+    return pagination(base, posts, options)
+  }
+}
+
+hexo.extend.generator.register('notebooks', function (locals) {
+  const { site_tree, notebooks } = hexo.theme.config
+  if (notebooks.tree.length === 0) {
+    return []
+  }
+
+  const routes = []
+
+  // The index page of all notebooks.
+  routes.push({
+    path: site_tree.notebooks.base_dir + '/index.html',
+    layout: ['notebooks'],
+    data: {
+      layout: 'notebooks',
+      menu_id: site_tree.notebooks.menu_id,
+    }
+  })
+
+  for (const notebook of Object.values(notebooks.tree)) {
+    const pages = locals.pages.filter(p => notebook.noteMap.has(p._id)).sort(notebook.order_by)
+    pages.data.sort((a, b) => notebook.noteMap.get(b._id).pin - notebook.noteMap.get(a._id).pin)
+
+    // Note list pages (for every tag) of current notebook.
+    for (const [_, tag] of notebook.tagTree) {
+      const notes = pages.filter(p => tag.noteSet.has(p._id))
+      const slices = paginationWithEmpty(tag.path, notes, {
+        perPage: notebook.per_page,
+        layout: ['notes'],
+        data: {
+          layout: 'notes',
+          menu_id: notebook.menu_id,
+          notebook: notebook.id,
+          activeTag: tag.id,
+        }
+      })
+      routes.push(...slices)
+    }
+  }
+
+  return routes
+})

package/scripts/tags/index.js

@@ -43,4 +43,9 @@ hexo.extend.tag.register('hashtag', require('./lib/hashtag')(hexo))
 hexo.extend.tag.register('okr', require('./lib/okr')(hexo), {ends: true})
 hexo.extend.tag.register('audio', require('./lib/audio')(hexo))
 hexo.extend.tag.register('video', require('./lib/video')(hexo))
+
+// read 阅读类
+hexo.extend.tag.register('reel', require('./lib/read/reel')(hexo), true)
+hexo.extend.tag.register('paper', require('./lib/read/paper')(hexo), true)
+
 // others