hexo-theme-stellar 1.19.0 → 1.20.0

package/layout/_partial/widgets/toc.ejs

@@ -1,5 +1,5 @@
 <%
-let proj = theme.wiki.projects[page.wiki];
+let proj = theme.wiki.tree[page.wiki];
 
 function layoutToc() {
   if (toc(page.content).length > 0) {
@@ -22,7 +22,10 @@ function layoutTocHeader(title) {
 
 function layoutDocTree(pages) {
   var el = '';
-  pages.forEach((p, i) => {
+  for (let p of pages) {
+    if (p.title == null || p.title.length == 0) {
+      continue;
+    }
     let isActive = '';
     if (p.path === page.path) {
       isActive += ' active';
@@ -34,14 +37,14 @@ function layoutDocTree(pages) {
         href += '#start'
       }
       el += '<a class="doc-tree-link' + isActive + '" href="' + href + '">';
-      el += '<span class="toc-text">' + (p.title || p.seo_title) + '</span>';
+      el += '<span class="toc-text">' + p.title + '</span>';
       el += '</a>';
     }
     if (p.path === page.path) {
       el += layoutToc();
     }
     el += '</div>';
-  });
+  }
   return el;
 }
 
@@ -74,17 +77,19 @@ function layoutDiv(fallback) {
       el += '</div>';
     } else if (proj) {
       // wiki 布局
-      if (proj.sections && proj.sections.length > 0) {
+      if (proj.sections && proj.sections.length > 0 && proj.pages.length > 1) { // 多 pages
         proj.sections.forEach((sec, i) => {
-          // 多 section
-          el += layoutTocHeader(sec.title);
+          if (sec.title?.length > 0) {
+            el += layoutTocHeader(sec.title);
+          }
           el += '<div class="widget-body fs14">';
           el += layoutDocTree(sec.pages);
           el += '</div>';
         });
-      } else {
-        // 单 section
-        el += layoutTocHeader(page.toc_title);
+      } else { // 单 page
+        if (proj.pages.length == 1) {
+          el += layoutTocHeader(page.toc_title);
+        }
         el += '<div class="widget-body fs14">';
         el += layoutDocTree(proj.pages);
         el += '</div>';

package/layout/index.ejs

@@ -51,10 +51,13 @@ function layout_posts(partial) {
 function layout_wikis(partial) {
   var el = '';
   var wikis = [];
-  const projects = theme.wiki.projects;
-  for (let proj_name of Object.keys(projects)) {
-    let proj = projects[proj_name];
-    if (proj.index === false || proj.pages == undefined || proj.pages.length === 0) {
+  const { shelf, tree } = theme.wiki;
+  for (let pid of shelf) {
+    let proj = tree[pid];
+    if (proj == null) {
+      continue;
+    }
+    if (proj.pages == undefined || proj.pages.length === 0) {
       continue;
     }
     if (page.filter === false) {

package/layout/mermaid.ejs

@@ -4,7 +4,11 @@
   <script>
     var mermaid_config = {
       startOnLoad: true,
-      theme: '<%- theme.plugins.mermaid.theme %>',
+      theme:
+        "<%- theme.style.darkmode %>" == "auto" &&
+          window.matchMedia("(prefers-color-scheme: dark)").matches
+          ? "dark"
+          : "<%- theme.plugins.mermaid.theme %>",
       logLevel: 3,
       themeVariables: {
         darkMode: true
@@ -12,17 +16,17 @@
       flowchart: {
         useMaxWidth: false,
         htmlLabels: true,
-        curve: 'linear'
+        curve: "linear"
       },
       gantt: {
-        axisFormat: '%m/%d/%Y'
+        axisFormat: "%Y/%m/%d"
       },
       sequence: {
         actorMargin: 50
       }
     }
     if (window.mermaid) {
-        mermaid.initialize(mermaid_config);
+      mermaid.initialize(mermaid_config);
     }
   </script>
 <% } %>

package/layout/page.ejs

@@ -12,6 +12,9 @@ function layoutDiv() {
   if (page.post_list) {
     el += partial('_partial/main/navbar/list_post');
   }
+  if (page.mermaid == true) {
+    el += partial('mermaid');
+  }
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
     el += partial('_partial/main/navbar/breadcrumb');
   }

package/layout/wiki.ejs

@@ -29,6 +29,9 @@ function layoutTitle() {
     page.header = 'auto';
   }
   %>
+  <% if (page.mermaid == true){ %>
+    <%- partial('mermaid') %>
+  <% } %>
   <%- partial('_partial/main/navbar/breadcrumb') %>
   <article class='md-text content <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
   <%- layoutTitle() %>

package/package.json

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

package/scripts/events/lib/doc_tree.js

@@ -7,157 +7,188 @@
 class WikiPage {
   constructor(page) { 
     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
-    this.seo_title = page.seo_title
-    this.wiki = page.wiki
-    this.order = page.order || 0
     this.updated = page.updated
   }
 }
 
-function createWikiObject(ctx) {
-  const wiki = { projects:{} }
-  const { projects } = ctx.locals.get('data')
-  if (projects) {
-    Object.assign(wiki.projects, projects)
+function getWikiObject(ctx) {
+  var wiki = { tree:{} }
+  const data = ctx.locals.get('data')
+  var list = []
+  for (let key of Object.keys(data)) {
+    if (key.includes('wiki/') && key.length > 5) {
+      let newKey = key.replace('wiki/', '')
+      let obj = data[key]
+      if ((typeof obj.tags == 'string') && obj.tags.constructor == String) {
+        obj.tags = [obj.tags]
+      }
+      if ((typeof obj.toc == 'object') && obj.toc.constructor == Array) {
+        obj.toc = { '': obj.toc }
+      }
+      obj.id = newKey
+      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 + '/'
+      }
+      list.push(obj)
+    }
+  }
+  list = list.sort((p1, p2) => p2.sort - p1.sort)
+  for (let item of list) {
+    wiki.tree[item.id] = item
   }
   return wiki
 }
 
 module.exports = ctx => {
   // wiki 配置
-  var wiki = createWikiObject(ctx)
+  var wiki = getWikiObject(ctx)
   const pages = ctx.locals.get('pages')
   // wiki 所有页面
-  const wiki_pages = pages.filter(p => (p.layout === 'wiki') && (p.wiki != undefined) && (p.wiki.length > 0)).map(p => new WikiPage(p))
+  const wiki_pages = pages.filter(p => (p.layout === 'wiki')).map(p => new WikiPage(p))
+  const wiki_list = Object.keys(wiki.tree)
 
   // 数据整合：项目标签
   var all_tag_name = []
-  for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id]
-    let tags = proj.tags
+  for (let id of wiki_list) {
+    let item = wiki.tree[id]
+    let tags = item.tags
     if (tags) {
-      if ((typeof tags == 'string') && tags.constructor == String) {
-        if (all_tag_name.includes(tags) === false) {
-          all_tag_name.push(tags)
+      tags.forEach((tag, i) => {
+        if (all_tag_name.includes(tag) === false) {
+          all_tag_name.push(tag)
         }
-        // 类型转换
-        tags = [tags]
-      } else if ((typeof tags == 'object') && tags.constructor == Array) {
-        tags.forEach((tag, i) => {
-          if (all_tag_name.includes(tag) === false) {
-            all_tag_name.push(tag)
-          }
-        })
-      }
-      wiki.projects[id].tags = tags
+      })
+      wiki.tree[id].tags = tags
     }
   }
-  // 补充未分组的项目
-  const projs = Object.keys(wiki.projects)
-  wiki_pages.forEach((p, i) => {
-    if (projs.includes(p.wiki) == false) {
-      if (wiki.projects[p.wiki] == undefined) {
-        wiki.projects[p.wiki] = {}
-        wiki.projects[p.wiki].pages = []
-      }
-      var proj = wiki.projects[p.wiki]
-      if (proj.description == undefined) {
-        proj.description = p.description
-      }
-      wiki.projects[p.wiki].pages.push(p)
-    }
-  })
+
   // 补充项目名称和首页
-  for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id]
-    proj.id = id
-    if (proj.title == undefined || proj.title.length === 0) {
-      proj.title = id
+  for (let id of wiki_list) {
+    let item = wiki.tree[id]
+    item.id = id
+    if (item.title == undefined || item.title.length === 0) {
+      item.title = id
     }
-    if (proj.name == undefined || proj.name.length == 0) {
-      proj.name = id
+    if (item.name == undefined || item.name.length == 0) {
+      item.name = id
     }
   }
-  // 补充 order
-  wiki_pages.forEach((p, i) => {
-    if (p.order == undefined) {
-      p.order = 0
-    }
-  })
-
+  
   // 数据整合：每个项目的子页面
-  for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id]
-    let proj_pages = wiki_pages.filter(p => p.wiki === id).sort((p1, p2) => p1.order < p2.order ? -1 : 1)
-    if (!proj_pages || proj_pages.length == 0) {
+  for (let i = 0; i < wiki_list.length; i++) {
+    let id = wiki_list[i];
+    let item = wiki.tree[id]
+    let sub_pages = wiki_pages.filter(p => p.wiki === id)
+    if (!sub_pages || sub_pages.length == 0) {
+      wiki_list.splice(i, 1)
+      delete wiki.tree[id]
       continue
     }
-    proj.homepage = proj_pages[0]
-    proj.homepage.is_homepage = true
-    // 内页按 section 分组
-    var section_configs = []
-    if (proj.sections) {
-      for (let t of Object.keys(proj.sections)) {
-        let range = proj.sections[t]
-        if (range.length > 1) {
-          section_configs.push({
-            title: t,
-            from: range[0],
-            to: range[1]
-          })
+
+    // 首页
+    // 未特别指定首页时，获取TOC第一页作为首页
+    if (item.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)
+          if (hs.length > 0) {
+            item.homepage = hs[0]
+            break
+          }
+        }
+        if (item.homepage != null) {
+          break
         }
       }
     }
+    if (item.homepage == null) {
+      item.homepage = sub_pages[0]
+    }
+    item.homepage.is_homepage = true
+    // 内页分组
     var sections = []
-    section_configs.forEach((sec, i) => {
-      const sec_pages = proj_pages.filter( p => p.order >= sec.from && p.order <= sec.to )
-      if (sec_pages && sec_pages.length > 0) {
+    var others = sub_pages
+    if (item.toc) {
+      // 根据配置设置顺序
+      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)
+        }
+        sections.push(sec)
+      }
+      if (others.length > 0 && others.filter(p => p.title?.length > 0).length > 0) {
         sections.push({
-          title: sec.title,
-          pages: sec_pages
+          title: '...',
+          pages: others.sort((p1, p2) => p1.path - p2.path)
         })
       }
-    })
-    proj.sections = sections
-    proj.pages = proj_pages
+    } else {
+      // 自动设置顺序
+      sections.push({
+        pages: sub_pages.sort((p1, p2) => p1.path - p2.path)
+      })
+    }
+    
+    // page number
+    var page_number = 0
+    for (let sec of sections) {
+      for (let page of sec.pages) {
+        page.page_number = page_number++
+      }
+    }
+    item.sections = sections
+    item.pages = sub_pages
   }
-
+  
   // 全站所有的项目标签
   var all_tags = {}
   all_tag_name.forEach((tag_name, i) => {
-    var projs = []
-    for (let id of Object.keys(wiki.projects)) {
-      let proj = wiki.projects[id]
-      if (proj.tags && proj.tags.includes(tag_name) === true && projs.includes(tag_name) === false) {
-        projs.push(proj.id)
+    var subs = []
+    for (let id of wiki_list) {
+      let item = wiki.tree[id]
+      if (item.tags && item.tags.includes(tag_name) === true && subs.includes(tag_name) === false) {
+        subs.push(item.id)
       }
     }
     all_tags[tag_name] = {
       name: tag_name,
       path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html',
-      items: projs
+      items: subs
     }
   })
 
   // 关联相似项目
-  for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id]
-    if (proj.tags) {
+  for (let id of wiki_list) {
+    let item = wiki.tree[id]
+    if (item.tags) {
       var related = []
-      proj.tags.forEach((tag_name, i) => {
+      item.tags.forEach((tag_name, i) => {
         let tagObj = all_tags[tag_name]
         related = related.concat(tagObj.items)
         related = [...new Set(related)]
       })
-      proj.related = related
+      item.related = related
     }
   }
 
   wiki.all_tags = all_tags
   wiki.all_pages = wiki_pages
+  wiki.shelf = ctx.locals.get('data').wiki
   ctx.theme.config.wiki = wiki
 
 }

package/scripts/filters/index.js

@@ -5,7 +5,10 @@ hexo.extend.filter.register('after_render:html', require('./lib/img_onerror').pr
 
 function change_image(data) {
     if (this.theme.config.tag_plugins.image.parse_markdown) {
-      data.content = data.content.replace(/!\[([^\]]*)]\(([^(]+)\)/g, '{% image $2 $1 %}');
+      data.content = data.content.replace(
+          /!\[(.*?)\]\((.*?)\s*(?:"(.*?)")?\)/g,
+          '{% image $2 $3 %}'
+      );
     }
     return data;
 }

package/scripts/tags/index.js

@@ -32,6 +32,6 @@ hexo.extend.tag.register('navbar', require('./lib/navbar')(hexo))
 hexo.extend.tag.register('note', require('./lib/note')(hexo))
 hexo.extend.tag.register('poetry', require('./lib/poetry')(hexo), true)
 hexo.extend.tag.register('quot', require('./lib/quot')(hexo))
-hexo.extend.tag.register('tag', require('./lib/tag')(hexo))
-
+hexo.extend.tag.register('hashtag', require('./lib/hashtag')(hexo))
+hexo.extend.tag.register('okr', require('./lib/okr')(hexo), {ends: true})
 // others

package/scripts/tags/inline-labels.js

@@ -29,7 +29,7 @@ hexo.extend.tag.register('psw', function(args) {
 hexo.extend.tag.register('sup', function(args) {
   args = hexo.args.map(args, ['color'], ['text'])
   var el = ''
-  el += '<sup class="tag-plugin sup"' + ' ' + hexo.args.joinTags(args, ['color']).join(' ') + '>'
+  el += '<sup class="tag-plugin colorful sup"' + ' ' + hexo.args.joinTags(args, ['color']).join(' ') + '>'
   el += args.text
   el += '</sup>'
   return el
@@ -37,7 +37,7 @@ hexo.extend.tag.register('sup', function(args) {
 hexo.extend.tag.register('sub', function(args) {
   args = hexo.args.map(args, ['color'], ['text'])
   var el = ''
-  el += '<sub class="tag-plugin sub"' + ' ' + hexo.args.joinTags(args, ['color']).join(' ') + '>'
+  el += '<sub class="tag-plugin colorful sub"' + ' ' + hexo.args.joinTags(args, ['color']).join(' ') + '>'
   el += args.text
   el += '</sub>'
   return el

package/scripts/tags/lib/ablock.js

@@ -17,7 +17,7 @@ module.exports = ctx => function(args, content) {
   }
   var el = ''
   // header
-  el += '<div class="tag-plugin note"'
+  el += '<div class="tag-plugin colorful note"'
   el += ' ' + ctx.args.joinTags(args, ['color', 'child']).join(' ')
   el += '>'
   // title

package/scripts/tags/lib/checkbox.js

@@ -13,7 +13,7 @@ module.exports = (ctx, type) => function(args) {
   args = ctx.args.map(args, ['color', 'checked', 'symbol'], ['text'])
   var el = ''
   // div
-  el += '<div class="tag-plugin checkbox"'
+  el += '<div class="tag-plugin colorful checkbox"'
   el += ' ' + ctx.args.joinTags(args, ['color', 'symbol']).join(' ')
   el += '>'
   // input

package/scripts/tags/lib/folders.js

@@ -15,7 +15,7 @@
 module.exports = ctx => function(args, content) {
   args = ctx.args.map(args, ['color'])
   var el = ''
-  el += '<div class="tag-plugin folders"'
+  el += '<div class="tag-plugin colorful folders"'
   el += ' ' + ctx.args.joinTags(args, ['color']).join(' ')
   el += '>'
   

package/scripts/tags/lib/folding.js

@@ -13,7 +13,7 @@ module.exports = ctx => function(args, content) {
   args = ctx.args.map(args, ['color', 'child', 'open'], ['title'])
   var el = ''
   // header
-  el += '<details class="tag-plugin folding"'
+  el += '<details class="tag-plugin colorful folding"'
   el += ' ' + ctx.args.joinTags(args, ['color', 'child']).join(' ')
   if (args.open && args.open == 'true') {
     el += ' open'

package/scripts/tags/lib/hashtag.js

@@ -0,0 +1,36 @@
+/**
+ * hashtag.js v1.0 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
+ *
+ * {% hashtag text href [color:color] %}
+ *
+ */
+
+'use strict'
+
+const tag_colors = ['red', 'orange', 'yellow', 'green', 'cyan', 'blue', 'purple']
+var tag_index = 0
+
+module.exports = ctx => function(args) {
+  args = ctx.args.map(args, ['color'], ['text', 'href'])
+  if (args.color == null) {
+    const default_color = ctx.theme.config.tag_plugins.hashtag?.default_color
+    if (default_color) {
+      args.color = default_color
+    } else {
+      args.color = tag_colors[tag_index]
+      tag_index += 1
+      if (tag_index >= tag_colors.length) {
+        tag_index = 0
+      }
+    }
+  }
+  var el = ''
+  el += '<a class="tag-plugin colorful hashtag"'
+  el += ' ' + ctx.args.joinTags(args, ['color', 'href']).join(' ')
+  el += '>'
+  el += '<svg t="1701408144765" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4228" width="200" height="200"><path d="M426.6 64.8c34.8 5.8 58.4 38.8 52.6 73.6l-19.6 117.6h190.2l23-138.6c5.8-34.8 38.8-58.4 73.6-52.6s58.4 38.8 52.6 73.6l-19.4 117.6H896c35.4 0 64 28.6 64 64s-28.6 64-64 64h-137.8l-42.6 256H832c35.4 0 64 28.6 64 64s-28.6 64-64 64h-137.8l-23 138.6c-5.8 34.8-38.8 58.4-73.6 52.6s-58.4-38.8-52.6-73.6l19.6-117.4h-190.4l-23 138.6c-5.8 34.8-38.8 58.4-73.6 52.6s-58.4-38.8-52.6-73.6l19.4-117.8H128c-35.4 0-64-28.6-64-64s28.6-64 64-64h137.8l42.6-256H192c-35.4 0-64-28.6-64-64s28.6-64 64-64h137.8l23-138.6c5.8-34.8 38.8-58.4 73.6-52.6z m11.6 319.2l-42.6 256h190.2l42.6-256h-190.2z" p-id="4229"></path></svg>'
+  el += '<span>' + args.text + '</span>'
+  el += '</a>'
+  return el
+}

package/scripts/tags/lib/image.js

@@ -71,7 +71,11 @@ module.exports = ctx => function(args) {
     if (args.download == 'true') {
       href = args.src
     }
-    el += '<a class="image-download blur" style="opacity:0" target="_blank" download="' + args.alt + 'href="' + href + '"><svg class="icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3734"><path d="M561.00682908 685.55838913a111.03077546 111.03077546 0 0 1-106.8895062 0L256.23182837 487.72885783a55.96309219 55.96309219 0 0 1 79.13181253-79.18777574L450.70357448 523.88101491V181.55477937a55.96309219 55.96309219 0 0 1 111.92618438 0v344.06109173l117.07478902-117.07478901a55.96309219 55.96309219 0 0 1 79.13181252 79.18777574zM282.81429711 797.1487951h447.70473912a55.96309219 55.96309219 0 0 1 0 111.92618438H282.81429711a55.96309219 55.96309219 0 0 1 0-111.92618438z" p-id="3735"></path></svg></a>'
+    let download = ''
+    if (args.alt) {
+      download = ' download="' + args.alt + '"'
+    }
+    el += '<a class="image-download blur" style="opacity:0" target="_blank"' + download + ' href="' + href + '"><svg class="icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3734"><path d="M561.00682908 685.55838913a111.03077546 111.03077546 0 0 1-106.8895062 0L256.23182837 487.72885783a55.96309219 55.96309219 0 0 1 79.13181253-79.18777574L450.70357448 523.88101491V181.55477937a55.96309219 55.96309219 0 0 1 111.92618438 0v344.06109173l117.07478902-117.07478901a55.96309219 55.96309219 0 0 1 79.13181252 79.18777574zM282.81429711 797.1487951h447.70473912a55.96309219 55.96309219 0 0 1 0 111.92618438H282.81429711a55.96309219 55.96309219 0 0 1 0-111.92618438z" p-id="3735"></path></svg></a>'
   }
   el += '</div>'
 

package/scripts/tags/lib/mark.js

@@ -14,7 +14,7 @@ module.exports = ctx => function(args) {
     args.color = ctx.theme.config.tag_plugins.mark.default_color
   }
   var el = ''
-  el += '<mark class="tag-plugin mark"'
+  el += '<mark class="tag-plugin colorful mark"'
   el += ' ' + ctx.args.joinTags(args, ['color']).join(' ')
   el += '>'
   el += args.text

package/scripts/tags/lib/note.js

@@ -19,7 +19,7 @@ module.exports = ctx => function(args) {
   }
   var el = ''
   // header
-  el += '<div class="tag-plugin note"'
+  el += '<div class="tag-plugin colorful note"'
   el += ' ' + ctx.args.joinTags(args, ['color', 'child']).join(' ')
   el += '>'
   // title