hexo-theme-stellar 1.18.5 → 1.20.0

package/layout/_partial/plugins/comments/layout.ejs

@@ -12,8 +12,8 @@ if (theme.comments.service && theme.comments.service.length > 0) {
   }
 }
 // 合并项目评论
-if (loadComment && page.layout == 'wiki' && page.wiki) {
-  let proj = theme.wiki.projects[page.wiki];
+let proj = theme.wiki.tree[page.wiki];
+if (loadComment && page.layout == 'wiki' && page.wiki && (proj != null)) {
   if (proj.comment_title != undefined && page.comment_title == undefined) {
     if (['utterances', 'beaudar', 'giscus'].includes(theme.comments.service)) {
       page.comment_title = proj.comment_title;

package/layout/_partial/plugins/comments/utterances/script.ejs

@@ -6,7 +6,7 @@
       try {
         el.innerHTML = '';
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
       var script = document.createElement('script');
       script.src = 'https://utteranc.es/client.js';

package/layout/_partial/plugins/comments/waline/script.ejs

@@ -11,6 +11,23 @@
       Waline.init(Object.assign(<%- JSON.stringify(theme.comments.waline) %>, {
         el: '#waline_container',
         path: path,
+        <% if(!!theme.comments.waline.imageUploader?.api){ %>
+          imageUploader: function(file) {
+            let headers = new Headers();
+            headers.set('Accept', 'application/json');
+            <% if(!!theme.comments.waline.imageUploader?.token) { %>
+              headers.set('<%= theme.comments.waline.imageUploader?.tokenName %>', '<%= theme.comments.waline.imageUploader?.token %>')
+            <% } %>
+            let formData = new FormData();
+            formData.append('<%= theme.comments.waline.imageUploader?.fileName %>', file);
+            return fetch('<%= theme.comments.waline.imageUploader?.api %>',{
+              method: 'POST',
+              body: formData,
+              headers: headers
+              }).then((resp) => resp.json())
+                .then((resp) => resp.<%= theme.comments.waline.imageUploader?.resp %>)
+          },
+        <% } %>
       }));
     });
   }

package/layout/_partial/scripts/index.ejs

@@ -62,6 +62,9 @@
     // 从 butterfly 和 volantis 获得灵感
     loadScript: (src, opt) => new Promise((resolve, reject) => {
       var script = document.createElement('script');
+      if (src.startsWith('/')){
+        src = stellar.config.root + src.substring(1);
+      }
       script.src = src;
       if (opt) {
         for (let key of Object.keys(opt)) {
@@ -100,6 +103,7 @@
       day: '<%- __('meta.date_suffix.day') %>',
       month: '<%- __('meta.date_suffix.month') %>',
     },
+    root : '<%- config.root %>',
   };
 
   // required plugins (only load if needs)
@@ -139,6 +143,9 @@
   if ('<%- theme.plugins.heti.enable %>' == 'true') {
     stellar.plugins.heti = Object.assign(<%- JSON.stringify(theme.plugins.heti) %>);
   }
+  if ('<%- theme.plugins.copycode.enable %>' == 'true') {
+    stellar.plugins.copycode = Object.assign(<%- JSON.stringify(theme.plugins.copycode) %>);
+  }
 </script>
 
 <!-- required -->

package/layout/_partial/sidebar/header.ejs

@@ -1,7 +1,7 @@
 <%
 var proj;
 if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.projects[page.wiki];
+  proj = theme.wiki.tree[page.wiki];
 }
 function layoutTitle(main, url, sub) {
   var el = '';

package/layout/_partial/sidebar/index.ejs

@@ -1,15 +1,15 @@
 <%
 var proj;
 if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.projects[page.wiki];
+  proj = theme.wiki.tree[page.wiki];
 }
 // 默认组件
 if (page.sidebar == undefined) {
   if (page.layout == 'post' && page.content) {
     page.sidebar = theme.sidebar.widgets.post;
   } else if (page.layout == 'wiki' && page.content && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj.sidebar) {
+    let proj = theme.wiki.tree[page.wiki];
+    if (proj?.sidebar) {
       page.sidebar = proj.sidebar;
     } else {
       page.sidebar = theme.sidebar.widgets.wiki;

package/layout/_partial/widgets/ghissues.ejs

@@ -6,7 +6,7 @@ function layoutDiv() {
   if (page.repo) {
     repo = page.repo
   } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
+    let proj = theme.wiki.tree[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
       if (proj.branch != undefined) {

package/layout/_partial/widgets/ghrepo.ejs

@@ -6,7 +6,7 @@ function layoutDiv() {
   if (page.repo) {
     repo = page.repo
   } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
+    let proj = theme.wiki.tree[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
       if (proj.branch != undefined) {

package/layout/_partial/widgets/recent.ejs

@@ -15,8 +15,8 @@ function layoutDiv() {
   if (page.menu_id == 'wiki') {
     arr = theme.wiki.all_pages.filter( p => {
       if (p.wiki) {
-        let proj = theme.wiki.projects[p.wiki];
-        return proj.index != false;
+        let proj = theme.wiki.tree[p.wiki];
+        return proj?.index != false;
       }
       return false
     })
@@ -32,7 +32,7 @@ function layoutDiv() {
     el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
     el += '<span class="title">'
     if (post.layout == 'wiki') {
-      let proj = theme.wiki.projects[post.wiki];
+      let proj = theme.wiki.tree[post.wiki];
       let name = proj?.name || post?.wiki;
       if (name) {
         el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';

package/layout/_partial/widgets/related.ejs

@@ -4,11 +4,12 @@ function layoutDiv() {
     return '';
   }
   var related = [];
-  let proj = theme.wiki.projects[page.wiki];
-  if (proj.related && proj.related.length > 0) {
-    proj.related.forEach((pid, i) => {
-      let p = theme.wiki.projects[pid];
-      if (p && p.title !== proj.title && p.index !== false) {
+  const { shelf, tree } = theme.wiki;
+  let proj = tree[page.wiki];
+  if (proj?.related?.length > 0) {
+    proj.related.filter(pid => shelf.includes(pid)).forEach((pid, i) => {
+      let p = tree[pid];
+      if (p && p.title !== proj?.title && p.homepage) {
         related.push(p);
       }
     });
@@ -24,15 +25,15 @@ function layoutDiv() {
     el += '<span class="name">' + __('meta.more', title) + '</span>';
     el += '</div>';
     el += '<div class="widget-body related-posts">';
-    related.forEach((p, i) => {
+    for (let p of related) {
       // 同一个分组中的其它项目
-      el += '<a class="item wiki" href="' + url_for(p.homepage.path) + '">';
+      el += '<a class="item wiki" href="' + url_for(p.homepage?.path) + '">';
       el += '<span class="title">' + p.title + '</span>';
       if (p.description && p.description.length > 0) {
         el += '<span class="excerpt">' + p.description + '</span>';
       }
       el += '</a>';
-    });
+    }
     el += '</div>';
     el += '</widget>';
   }

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

@@ -0,0 +1,32 @@
+<% if (theme.plugins.mermaid.enable) { %>
+  <script type="text/javascript" src="<%- theme.plugins.mermaid.js %>"></script>
+
+  <script>
+    var mermaid_config = {
+      startOnLoad: true,
+      theme:
+        "<%- theme.style.darkmode %>" == "auto" &&
+          window.matchMedia("(prefers-color-scheme: dark)").matches
+          ? "dark"
+          : "<%- theme.plugins.mermaid.theme %>",
+      logLevel: 3,
+      themeVariables: {
+        darkMode: true
+      },
+      flowchart: {
+        useMaxWidth: false,
+        htmlLabels: true,
+        curve: "linear"
+      },
+      gantt: {
+        axisFormat: "%Y/%m/%d"
+      },
+      sequence: {
+        actorMargin: 50
+      }
+    }
+    if (window.mermaid) {
+      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/post.ejs

@@ -22,10 +22,16 @@ if (theme.plugins.heti && theme.plugins.heti.enable) {
 <% if (page.mathjax == true){ %>
     <%- partial('mathjax') %>
 <% } %>
+<% if (page.mermaid == true){ %>
+  <%- partial('mermaid') %>
+<% } %>
 <%- partial('_partial/main/navbar/breadcrumb') %>
 <article class='md-text content<%- heti %> <%- post.layout %><%- post.indent ? ' indent' : '' %><%- scrollreveal() %>'>
 <%- layoutTitle() %>
 <%- post.content %>
+<% if (theme.plugins.tianli_gpt.enable && ['all', 'post'].includes(theme.plugins.tianli_gpt.field)) { %>
+  <%- partial('_partial/main/article/ai_abstract') %>
+<% } %>
 <%- partial('_partial/main/article/article_footer') %>
 </article>
 <%- partial('_partial/main/article/read_next') %>

package/layout/wiki.ejs

@@ -29,10 +29,16 @@ 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() %>
   <%- page.content %>
+  <% if (theme.plugins.tianli_gpt.enable && ['all', 'wiki'].includes(theme.plugins.tianli_gpt.field)) { %>
+	<%- partial('_partial/main/article/ai_abstract') %>
+  <% } %>
   <%- partial('_partial/main/article/article_footer') %>
   </article>
   <%- partial('_partial/main/article/read_next') %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.18.5",
+  "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

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

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