hexo-theme-stellar 1.24.1 → 1.26.0

package/layout/page.ejs

@@ -1,28 +1,75 @@
 <%
+const { layout } = page
+// 是否使用 Heti 布局插件
+const isUsingHeti = theme.plugins.heti && theme.plugins.heti.enable
+// 是否使用 TianliGPT 插件
+const isUsingTianliGPT = theme.plugins.tianli_gpt.enable && ['all', page.layout].includes(theme.plugins.tianli_gpt.field)
+
+// 默认的 menu_id
+if (page.menu_id == null) {
+  if (page.wiki?.length > 0) {
+    page.menu_id = theme.site_tree.wiki.menu_id
+  } else if (page.topic?.length > 0) {
+    page.menu_id = theme.site_tree.topic.menu_id
+  } else {
+    page.menu_id = theme.site_tree.post.menu_id
+  }
+}
+// 默认的 title
+if (page.title == null) {
+  if (page.wiki) {
+    page.title = __('btn.wiki')
+  }
+}
+
 function layoutTitle() {
-  const title = page.h1 != null ? page.h1 : page.title;
+  const title = page.h1 != null ? page.h1 : page.title
   if (title && title.length > 0) {
-    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+    return `<h1 class="article-title"><span>${title}</span></h1>`
   } else {
-    return '';
+    return ''
+  }
+}
+
+function articleClass() {
+  var str = `md-text content${scrollreveal(' ')}`
+  if (isUsingHeti) {
+    str += ' heti'
   }
+  if (isUsingTianliGPT) {
+    str += ' '
+  }
+  return str
 }
+
 function layoutDiv() {
-  var el = '';
-  if (page.post_list) {
-    el += partial('_partial/main/navbar/list_post');
+  var el = ''
+  if (page.nav_tabs) {
+    el += partial('_partial/main/navbar/nav_tabs_blog')
   }
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
-    el += partial('_partial/main/navbar/breadcrumb');
+    el += partial('_partial/main/navbar/article_top_area')
   }
-  el += '<article class="md-text content ' + page.layout + (page.indent ? ' indent' : '') + scrollreveal() + '">';
-  el += layoutTitle();
+  el += `<article class="${articleClass()}">`
+  el += layoutTitle()
   if (page.content && page.content.length > 0) {
-    el += page.content;
+    el += page.content
+  }
+  if (layout === 'post') {
+    el += partial('_partial/main/article/article_footer')
+  }
+  el += `</article>`
+  if (layout === 'post' || page.wiki) {
+    el += partial('_partial/main/article/read_next')
+  }
+  if (isUsingTianliGPT) {
+    el += partial('_partial/plugins/ai/tianli_gpt')
+  }
+  if (layout === 'post') {
+    el += partial('_partial/main/article/related_posts')
   }
-  el += '</article>';
-  el += partial('_partial/plugins/comments/layout');
-  return el;
+  el += partial('_partial/plugins/comments/layout')
+  return el
 }
 %>
 

package/layout/tags.ejs

@@ -7,9 +7,9 @@ if (page.menu_id == undefined) {
 <% if (site.tags.length) { %>
   <% page.title = __('btn.tags'); %>
   <% page.layout = 'tags'; %>
-  <%- partial('_partial/main/navbar/list_post') %>
+  <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
-    <article class='<%- scrollreveal() %>' id='tags'>
+    <article class='<%- scrollreveal("") %>' id='tags'>
       <% site.tags.sort('length', -1).each(function(tag){ %>
         <a class='tag' href="<%= url_for(tag.path) %>">
           <span class='name'><%= tag.name %></span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.24.1",
+  "version": "1.26.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "hexo-renderer-ejs": "^2.0.0",
-    "hexo-renderer-stylus": "^2.1.0"
+    "hexo-renderer-stylus": "^3.0.1"
   },
   "homepage": "https://xaoxuu.com/wiki/stellar/",
   "devDependencies": {

package/scripts/events/index.js

@@ -8,9 +8,14 @@ hexo.on('generateBefore', () => {
   require('./lib/links')(hexo);
   require('./lib/authors')(hexo);
   require('./lib/doc_tree')(hexo);
+  require('./lib/topic_tree')(hexo);
   require('./lib/utils')(hexo);
 });
 
+hexo.on('generateAfter', () => {
+  require('./lib/merge_posts')(hexo);
+});
+
 hexo.on('ready', () => {
   const { version, homepage, repository } = require('../../package.json');
   hexo.log.info(`Welcome to Stellar ${version}

package/scripts/events/lib/authors.js

@@ -6,7 +6,7 @@
 
 module.exports = ctx => {
   var authors = ctx.locals.get('data').authors || {}
-  let basePath = ctx.config.author_dir || 'author'
+  let basePath = ctx.theme.config.site_tree.author.base_dir
   // url
   for (let key of Object.keys(authors)) {
     let author = authors[key]

package/scripts/events/lib/config.js

@@ -7,57 +7,61 @@
 
 'use strict';
 
-const path = require('path');
+const path = require('path')
 
-module.exports = hexo => {
+module.exports = ctx => {
 
-  const { cache, language_switcher } = hexo.theme.config;
+  const { cache, language_switcher } = ctx.theme.config
   const warning = function(...args) {
-    hexo.log.warn(`Since ${args[0]} is turned on, the ${args[1]} is disabled to avoid potential hazards.`);
-  };
+    ctx.log.warn(`Since ${args[0]} is turned on, the ${args[1]} is disabled to avoid potential hazards.`)
+  }
 
   if (cache && cache.enable && language_switcher) {
-    warning('language_switcher', 'caching');
-    cache.enable = false;
+    warning('language_switcher', 'caching')
+    cache.enable = false
   }
 
-  if (cache && cache.enable && hexo.config.relative_link) {
-    warning('caching', '`relative_link` option in Hexo `_config.yml`');
-    hexo.config.relative_link = false;
+  if (cache && cache.enable && ctx.config.relative_link) {
+    warning('caching', '`relative_link` option in Hexo `_config.yml`')
+    ctx.config.relative_link = false
   }
-  // hexo.config.meta_generator = false;
+  // ctx.config.meta_generator = false;
 
   // merge data
-  const data = hexo.locals.get('data');
-  // merge widgets
-  var widgets = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '_data/widgets.yml'), engine: 'yaml' });
+  const data = ctx.locals.get('data')
+  // merge widgets: 可覆盖删除的合并
+  var widgets = ctx.render.renderSync({ path: path.join(ctx.theme_dir, '_data/widgets.yml'), engine: 'yaml' })
   if (data.widgets) {
     for (let i of Object.keys(data.widgets)) {
-      let widget = data.widgets[i];
+      let widget = data.widgets[i]
       if (widget == null || widget.length == 0) {
         // delete
-        delete widgets[i];
+        delete widgets[i]
       } else {
         // create
         if (widgets[i] == null) {
-          widgets[i] = widget;
+          widgets[i] = widget
         } else {
           // merge
           for (let j of Object.keys(widget)) {
-            widgets[i][j] = widget[j];
+            widgets[i][j] = widget[j]
           }
         }
       }
     }
   }
-  if (hexo.theme.config.data == undefined) {
-    hexo.theme.config.data = {};
+  ctx.theme.config.widgets = widgets
+
+  // merge icons: 简单覆盖合并
+  var icons = ctx.render.renderSync({ path: path.join(ctx.theme_dir, '_data/icons.yml'), engine: 'yaml' })
+  if (data.icons) {
+    icons = Object.assign({}, icons, data.icons)
   }
-  hexo.theme.config.data['widgets'] = widgets;
+  ctx.theme.config.icons = icons
 
   // default menu
-  if (hexo.theme.config.sidebar.menu == undefined) {
-    hexo.theme.config.sidebar.menu = [];
+  if (ctx.theme.config.menubar == undefined) {
+    ctx.theme.config.menubar = {}
   }
 
-};
+}

package/scripts/events/lib/doc_tree.js

@@ -9,7 +9,6 @@ class WikiPage {
     this.id = page._id
     this.wiki = page.wiki
     this.title = page.title
-    this.seo_title = page.seo_title
     this.path = page.path
     this.path_key = page.path.replace('.html', '')
     this.layout = page.layout
@@ -35,11 +34,15 @@ function getWikiObject(ctx) {
       if (obj.sort == null) {
         obj.sort = 0
       }
-      if (obj.path?.startsWith('/')) {
-        obj.path = obj.path.substring(1)
-      }
-      if (obj.path?.endsWith('/') == false) {
-        obj.path = obj.path + '/'
+      if (obj.base_dir) {
+        if (obj.base_dir.startsWith('/')) {
+          obj.base_dir = obj.base_dir.substring(1)
+        }
+        if (obj.base_dir.length > 1 && obj.base_dir.endsWith('/') == false) {
+          obj.base_dir = obj.base_dir + '/'
+        }
+      } else {
+        obj.base_dir = ''
       }
       list.push(obj)
     }
@@ -56,7 +59,7 @@ module.exports = ctx => {
   var wiki = getWikiObject(ctx)
   const pages = ctx.locals.get('pages')
   // wiki 所有页面
-  const wiki_pages = pages.filter(p => (p.layout === 'wiki')).map(p => new WikiPage(p))
+  const wiki_pages = pages.filter(p => (p.wiki != null)).map(p => new WikiPage(p))
   const wiki_list = Object.keys(wiki.tree)
   // 上架的项目列表
   wiki.shelf = ctx.locals.get('data').wiki || []
@@ -101,25 +104,30 @@ module.exports = ctx => {
 
     // 首页
     // 未特别指定首页时，获取TOC第一页作为首页
-    if (item.homepage == null && item.toc != null) {
+    var homepage = item.homepage
+    if (homepage == null && item.toc != null) {
       for (let id of Object.keys(item.toc)) {
         const sec = item.toc[id]
         for (let key of sec) {
-          let hs = sub_pages.filter(p => p.path_key == item.path + key)
+          let hs = sub_pages.filter(p => p.path_key == item.base_dir + key)
           if (hs.length > 0) {
-            item.homepage = hs[0]
+            homepage = hs[0]
             break
           }
         }
-        if (item.homepage != null) {
+        if (homepage != null) {
           break
         }
       }
     }
-    if (item.homepage == null) {
-      item.homepage = sub_pages[0]
+    if (homepage == null) {
+      homepage = sub_pages[0]
+    }
+    if (typeof homepage == 'string') {
+      homepage = {path: homepage}
     }
-    item.homepage.is_homepage = true
+    homepage.is_homepage = true
+    item.homepage = homepage
     // 内页分组
     var sections = []
     var others = sub_pages
@@ -128,21 +136,21 @@ module.exports = ctx => {
       for (let title of Object.keys(item.toc)) {
         var sec = { title: title, pages: []}
         for (let key of item.toc[title]) {
-          sec.pages = sec.pages.concat(sub_pages.filter(p => p.path_key == item.path + key))
-          others = others.filter(p => p.path_key != item.path + key)
+          sec.pages = sec.pages.concat(sub_pages.filter(p => p.path_key == item.base_dir + key))
+          others = others.filter(p => p.path_key != item.base_dir + key)
         }
         sections.push(sec)
       }
       if (others.length > 0 && others.filter(p => p.title?.length > 0).length > 0) {
         sections.push({
           title: '...',
-          pages: others.sort((p1, p2) => p1.path - p2.path)
+          pages: others.sort((p1, p2) => p1.title - p2.title)
         })
       }
     } else {
       // 自动设置顺序
       sections.push({
-        pages: sub_pages.sort((p1, p2) => p1.path - p2.path)
+        pages: sub_pages.sort((p1, p2) => p1.title - p2.title)
       })
     }
     
@@ -177,7 +185,7 @@ module.exports = ctx => {
     }
     all_tags[tag_name] = {
       name: tag_name,
-      path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html',
+      path: (ctx.theme.config.site_tree.index_wiki.base_dir) + '/tags/' + tag_name + '/index.html',
       items: items
     }
   })

package/scripts/events/lib/merge_posts.js

@@ -0,0 +1,46 @@
+/**
+ * merge_posts.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 
+ */
+
+'use strict';
+
+class RelatedPage {
+  constructor(page) { 
+    this.id = page._id
+    this.wiki = page.wiki
+    this.topic = page.topic
+    this.title = page.title
+    this.path = page.path
+    this.path_key = page.path.replace('.html', '')
+    this.layout = page.layout
+    this.date = page.date
+    this.updated = page.updated
+  }
+}
+
+module.exports = ctx => {
+  var topic = ctx.theme.config.topic
+  const posts = ctx.locals.get('posts')
+  posts.sort('date').each(function(post) {
+    let obj = new RelatedPage(post)
+    // 合并拥有共同 topic 的文章到 topic.tree
+    if (post.topic?.length > 0) {
+      var topicObject = topic.tree[post.topic]
+      if (topicObject) {
+        obj.page_number = topicObject.pages.length + 1
+        topicObject.pages.push(obj)
+      }
+    }
+  })
+  
+  // topic homepage
+  for (let tid of Object.keys(topic.tree)) {
+    let topicObject = topic.tree[tid]
+    if (topicObject.order_by == '-date') {
+      topicObject.pages = topicObject.pages.reverse()
+    }
+    topicObject.homepage = topicObject.pages[0]
+  }
+
+}

package/scripts/events/lib/topic_tree.js

@@ -0,0 +1,45 @@
+/**
+ * topic.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 用于专栏/专题文章，一个专栏类似于 wiki 模块中的一个项目文档
+ * 区别是：
+ * 1. 按发布日期排序，无需手动排序
+ * 
+ */
+
+'use strict';
+
+function getTopicTree(ctx) {
+  var tree = {}
+  const data = ctx.locals.get('data')
+  var list = []
+  for (let key of Object.keys(data)) {
+    if (key.startsWith('topic/') && key.length > 5) {
+      let newKey = key.replace('topic/', '')
+      let obj = data[key]
+      obj.id = newKey
+      if (obj.order_by == null) {
+        obj.order_by = '-date'
+      }
+      if (obj.path == null) {
+        obj.path = `/topic/${newKey}/`
+      }
+      obj.pages = []
+      list.push(obj)
+    }
+  }
+  for (let item of list) {
+    tree[item.id] = item
+  }
+  return tree
+}
+
+module.exports = ctx => {
+  var topic = ctx.locals.get('data').topic || {}
+  // 专栏结构树
+  topic.tree = getTopicTree(ctx)
+  // 索引页显示的专栏列表
+  if (topic.publish_list == null) {
+    topic.publish_list = Object.keys(topic.tree)
+  }
+  ctx.theme.config.topic = topic
+}

package/scripts/generators/404.js

@@ -3,8 +3,13 @@
  */
 
 hexo.extend.generator.register('404', function (locals) {
+  const { site_tree } = hexo.theme.config
   return {
-    path: '/404.html',
-    layout: ['404']
+    path: site_tree.error_page['404'],
+    layout: ['404'],
+    data: {
+      layout: '404',
+      menu_id: site_tree.error_page.menu_id
+    }
   }
-});
+})

package/scripts/generators/author.js

@@ -3,7 +3,7 @@
  */
 
 hexo.extend.generator.register('author', function (locals) {
-  const { authors } = hexo.theme.config
+  const { site_tree, authors } = hexo.theme.config
   var pages = []
   for (let key of Object.keys(authors)) {
     const author = authors[key]
@@ -14,7 +14,9 @@ hexo.extend.generator.register('author', function (locals) {
       path: author.path,
       layout: ['archive'],
       data: {
-        'author': author
+        author: author,
+        sidebar: site_tree.author.sidebar,
+        menu_id: site_tree.author.menu_id
       }
     })
   }

package/scripts/generators/categories.js

@@ -6,10 +6,10 @@ hexo.extend.generator.register('categories', function (locals) {
   if (locals.categories && locals.categories.length > 0) {
     return {
       path: hexo.config.category_dir + '/index.html',
-      data: locals.posts,
-      layout: ['categories']
+      layout: ['categories'],
+      data: locals.posts
     }
   } else {
-    return {};
+    return {}
   }
-});
+})

package/scripts/generators/tags.js

@@ -6,10 +6,10 @@ hexo.extend.generator.register('tags', function (locals) {
   if (locals.tags && locals.tags.length > 0) {
     return {
       path: hexo.config.tag_dir + '/index.html',
-      data: locals.posts,
-      layout: ['tags']
+      layout: ['tags'],
+      data: locals.posts
     }
   } else {
-    return {};
+    return {}
   }
-});
+})

package/scripts/generators/topic.js

@@ -0,0 +1,21 @@
+/**
+ * topic v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ */
+
+hexo.extend.generator.register('index_topic', function (locals) {
+  const { site_tree, topic } = hexo.theme.config
+  const topicIdList = Object.keys(topic.tree)
+  if (topicIdList.length == 0) {
+    return {}
+  }
+  var ret = []
+  ret.push({
+    path: site_tree.index_topic.base_dir + '/index.html',
+    layout: ['index_topic'],
+    data: {
+      layout: 'index_topic',
+      menu_id: site_tree.index_topic.menu_id
+    }
+  })
+  return ret
+})

package/scripts/generators/wiki.js

@@ -3,34 +3,36 @@
  */
 
 hexo.extend.generator.register('wiki', function (locals) {
-  var hasWiki = false;
-  locals.pages.forEach((page, i) => {
-    if (page.layout == 'wiki') {
-      hasWiki = true;
+  const { site_tree, wiki } = hexo.theme.config
+  const wikiIdList = Object.keys(wiki.tree)
+  if (wikiIdList.length == 0) {
+    return {}
+  }
+  var ret = []
+  ret.push({
+    path: site_tree.index_wiki.base_dir + '/index.html',
+    layout: ['index_wiki'],
+    data: {
+      layout: 'index_wiki',
+      menu_id: site_tree.index_wiki.menu_id,
+      filter: false
     }
-  });
-  if (hasWiki) {
-    var ret = [];
-    ret.push({
-      path: (hexo.config.wiki_dir || 'wiki') + '/index.html',
-      data: {'filter': false},
-      layout: ['wiki']
-    });
-    if (hexo.theme.config.wiki && hexo.theme.config.wiki.all_tags) {
-      for (let id of Object.keys(hexo.theme.config.wiki.all_tags)) {
-        let tag = hexo.theme.config.wiki.all_tags[id];
-        ret.push({
-          path: tag.path,
-          data: {
-            'filter': true,
-            'tagName': tag.name
-          },
-          layout: ['wiki']
-        });
-      }
+  })
+  if (wiki.all_tags) {
+    for (let id of Object.keys(wiki.all_tags)) {
+      let tag = wiki.all_tags[id]
+      ret.push({
+        path: tag.path,
+        layout: ['index_wiki'],
+        data: {
+          layout: 'index_wiki',
+          menu_id: site_tree.index_wiki.menu_id,
+          filter: true,
+          tagName: tag.name,
+          title: tag.name
+        }
+      })
     }
-    return ret;
-  } else {
-    return {};
   }
-});
+  return ret
+})

package/scripts/helpers/category_color.js

@@ -16,7 +16,7 @@ hexo.extend.helper.register('category_color', function(cat){
     } else if (textColor.length == (1+6)) { // #ffffff
       bgColor += '20'
     }
-    return ` style="--text-p3:${textColor};--theme-block:${bgColor}"`;
+    return ` style="--text-p2:${textColor};--theme-block:${bgColor}"`;
   }
   return ''
 })

package/scripts/helpers/icon.js

@@ -0,0 +1,16 @@
+'use strict';
+
+hexo.extend.helper.register('icon', function(key) {
+  const { icons } = hexo.theme.config
+  var result = ''
+  if (icons[key]) {
+    result = icons[key]
+  } else {
+    result = key
+  }
+  if (result.startsWith('/') || result.startsWith('https://') || result.startsWith('http://')) {
+    return `<img src="${result}" />`
+  } else {
+    return result
+  }
+})